--- a/toolkit/crashreporter/InjectCrashReporter.cpp
+++ b/toolkit/crashreporter/InjectCrashReporter.cpp
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "InjectCrashReporter.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
-#include "client/windows/crash_generation/crash_generation_client.h"
+#include "windows/crash_generation/crash_generation_client.h"
 #include "nsExceptionHandler.h"
 #include "LoadLibraryRemote.h"
 #include "nsWindowsHelpers.h"
 
 using google_breakpad::CrashGenerationClient;
 using CrashReporter::GetChildNotificationPipe;
 
 namespace mozilla {

rename from toolkit/crashreporter/google-breakpad/src/client/apple/Framework/BreakpadDefines.h
rename to toolkit/crashreporter/breakpad-client/apple/Framework/BreakpadDefines.h

rename from toolkit/crashreporter/google-breakpad/src/client/ios/Breakpad.h
rename to toolkit/crashreporter/breakpad-client/ios/Breakpad.h

rename from toolkit/crashreporter/google-breakpad/src/client/ios/Breakpad.mm
rename to toolkit/crashreporter/breakpad-client/ios/Breakpad.mm

rename from toolkit/crashreporter/google-breakpad/src/client/ios/Breakpad.xcodeproj/project.pbxproj
rename to toolkit/crashreporter/breakpad-client/ios/Breakpad.xcodeproj/project.pbxproj

rename from toolkit/crashreporter/google-breakpad/src/client/ios/BreakpadController.h
rename to toolkit/crashreporter/breakpad-client/ios/BreakpadController.h

rename from toolkit/crashreporter/google-breakpad/src/client/ios/BreakpadController.mm
rename to toolkit/crashreporter/breakpad-client/ios/BreakpadController.mm

rename from toolkit/crashreporter/google-breakpad/src/client/ios/Breakpad_Prefix.pch
rename to toolkit/crashreporter/breakpad-client/ios/Breakpad_Prefix.pch

rename from toolkit/crashreporter/google-breakpad/src/client/ios/handler/ios_exception_minidump_generator.h
rename to toolkit/crashreporter/breakpad-client/ios/handler/ios_exception_minidump_generator.h

rename from toolkit/crashreporter/google-breakpad/src/client/ios/handler/ios_exception_minidump_generator.mm
rename to toolkit/crashreporter/breakpad-client/ios/handler/ios_exception_minidump_generator.mm

rename from toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/client_info.h
rename to toolkit/crashreporter/breakpad-client/linux/crash_generation/client_info.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_client.cc
rename to toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_client.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_client.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_client.cc
@@ -22,17 +22,17 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/linux/crash_generation/crash_generation_client.h"
+#include "linux/crash_generation/crash_generation_client.h"
 
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <algorithm>
 
 #include "common/linux/eintr_wrapper.h"

rename from toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_client.h
rename to toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_client.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.cc
rename to toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_server.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_server.cc
@@ -36,20 +36,20 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <vector>
 
-#include "client/linux/crash_generation/crash_generation_server.h"
-#include "client/linux/crash_generation/client_info.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
+#include "linux/crash_generation/crash_generation_server.h"
+#include "linux/crash_generation/client_info.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/minidump_writer/minidump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/guid_creator.h"
 #include "common/linux/safe_readlink.h"
 
 static const char kCommandQuit = 'x';
 
 namespace google_breakpad {
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.h
rename to toolkit/crashreporter/breakpad-client/linux/crash_generation/crash_generation_server.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/data/linux-gate-amd.sym
rename to toolkit/crashreporter/breakpad-client/linux/data/linux-gate-amd.sym

rename from toolkit/crashreporter/google-breakpad/src/client/linux/data/linux-gate-intel.sym
rename to toolkit/crashreporter/breakpad-client/linux/data/linux-gate-intel.sym
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/data/linux-gate-intel.sym
+++ b/toolkit/crashreporter/breakpad-client/linux/data/linux-gate-intel.sym
@@ -1,3 +1,3 @@
 MODULE Linux x86 4FBDA58B5A1DF5A379E3CF19A235EA090 linux-gate.so
 PUBLIC 400 0 __kernel_vsyscall
-STACK WIN 4 400 200 3 3 0 0 0 0 0 1
\ No newline at end of file
+STACK WIN 4 400 200 3 3 0 0 0 0 0 1

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/mapping_info.h
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/mapping_info.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/raw_context_cpu.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/thread_info.cc
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/thread_info.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/thread_info.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/thread_info.cc
@@ -22,17 +22,17 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/linux/dump_writer_common/thread_info.h"
+#include "linux/dump_writer_common/thread_info.h"
 
 #include <string.h>
 #include <assert.h>
 
 #include "common/linux/linux_libc_support.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace {

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/thread_info.h
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/thread_info.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/thread_info.h
+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/thread_info.h
@@ -28,17 +28,17 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_LINUX_DUMP_WRITER_COMMON_THREAD_INFO_H_
 #define CLIENT_LINUX_DUMP_WRITER_COMMON_THREAD_INFO_H_
 
 #include <sys/ucontext.h>
 #include <sys/user.h>
 
-#include "client/linux/dump_writer_common/raw_context_cpu.h"
+#include "linux/dump_writer_common/raw_context_cpu.h"
 #include "common/memory.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 #if defined(__i386) || defined(__x86_64)
 typedef __typeof__(((struct user*) 0)->u_debugreg[0]) debugreg_t;
 #endif

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
@@ -22,17 +22,17 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/linux/dump_writer_common/ucontext_reader.h"
+#include "linux/dump_writer_common/ucontext_reader.h"
 
 #include "common/linux/linux_libc_support.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 // Minidump defines register structures which are different from the raw
 // structures which we get from the kernel. These are platform specific

rename from toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
rename to toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
@@ -28,17 +28,17 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_LINUX_DUMP_WRITER_COMMON_UCONTEXT_READER_H
 #define CLIENT_LINUX_DUMP_WRITER_COMMON_UCONTEXT_READER_H
 
 #include <sys/ucontext.h>
 #include <sys/user.h>
 
-#include "client/linux/dump_writer_common/raw_context_cpu.h"
+#include "linux/dump_writer_common/raw_context_cpu.h"
 #include "common/memory.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 // Wraps platform-dependent implementations of accessors to ucontext structs.
 struct UContextReader {
   static uintptr_t GetStackPointer(const struct ucontext* uc);

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
rename to toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
@@ -58,17 +58,17 @@
 
 // This code is a little fragmented. Different functions of the ExceptionHandler
 // class run in a number of different contexts. Some of them run in a normal
 // context and are easy to code, others run in a compromised context and the
 // restrictions at the top of minidump_writer.cc apply: no libc and use the
 // alternative malloc. Each function should have comment above it detailing the
 // context which it runs in.
 
-#include "client/linux/handler/exception_handler.h"
+#include "linux/handler/exception_handler.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/limits.h>
 #include <pthread.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdio.h>
@@ -85,20 +85,20 @@
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "common/basictypes.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/memory.h"
-#include "client/linux/log/log.h"
-#include "client/linux/microdump_writer/microdump_writer.h"
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
+#include "linux/log/log.h"
+#include "linux/microdump_writer/microdump_writer.h"
+#include "linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/minidump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 #if defined(__ANDROID__)
 #include "linux/sched.h"
 #endif
 
 #ifndef PR_SET_PTRACER

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h
rename to toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h
+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
@@ -32,19 +32,19 @@
 
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/ucontext.h>
 
 #include <string>
 
-#include "client/linux/crash_generation/crash_generation_client.h"
-#include "client/linux/handler/minidump_descriptor.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
+#include "linux/crash_generation/crash_generation_client.h"
+#include "linux/handler/minidump_descriptor.h"
+#include "linux/minidump_writer/minidump_writer.h"
 #include "common/scoped_ptr.h"
 #include "common/using_std_string.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 // ExceptionHandler
 //

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/handler/exception_handler_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler_unittest.cc
@@ -37,18 +37,18 @@
 #include <sys/wait.h>
 #if defined(__mips__)
 #include <sys/cachectl.h>
 #endif
 
 #include <string>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/minidump_writer/minidump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/ignore_ret.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/tests/auto_tempdir.h"
 #include "common/using_std_string.h"
 #include "third_party/lss/linux_syscall_support.h"
 #include "google_breakpad/processor/minidump.h"
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/microdump_extra_info.h
rename to toolkit/crashreporter/breakpad-client/linux/handler/microdump_extra_info.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_descriptor.cc
rename to toolkit/crashreporter/breakpad-client/linux/handler/minidump_descriptor.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_descriptor.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/handler/minidump_descriptor.cc
@@ -24,17 +24,17 @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdio.h>
 
-#include "client/linux/handler/minidump_descriptor.h"
+#include "linux/handler/minidump_descriptor.h"
 
 #include "common/linux/guid_creator.h"
 
 namespace google_breakpad {
 
 //static
 const MinidumpDescriptor::MicrodumpOnConsole
     MinidumpDescriptor::kMicrodumpOnConsole = {};

rename from toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_descriptor.h
rename to toolkit/crashreporter/breakpad-client/linux/handler/minidump_descriptor.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_descriptor.h
+++ b/toolkit/crashreporter/breakpad-client/linux/handler/minidump_descriptor.h
@@ -30,17 +30,17 @@
 #ifndef CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_
 #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <string>
 
-#include "client/linux/handler/microdump_extra_info.h"
+#include "linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"
 
 // This class describes how a crash dump should be generated, either:
 // - Writing a full minidump to a file in a given directory (the actual path,
 //   inside the directory, is determined by this class).
 // - Writing a full minidump to a given fd.
 // - Writing a reduced microdump to the console (logcat on Android).
 namespace google_breakpad {

rename from toolkit/crashreporter/google-breakpad/src/client/linux/log/log.cc
rename to toolkit/crashreporter/breakpad-client/linux/log/log.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/log/log.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/log/log.cc
@@ -22,17 +22,17 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/linux/log/log.h"
+#include "linux/log/log.h"
 
 #if defined(__ANDROID__)
 #include <android/log.h>
 #include <dlfcn.h>
 #else
 #include "third_party/lss/linux_syscall_support.h"
 #endif
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/log/log.h
rename to toolkit/crashreporter/breakpad-client/linux/log/log.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc
rename to toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
@@ -25,28 +25,28 @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // This translation unit generates microdumps into the console (logcat on
 // Android). See crbug.com/410294 for more info and design docs.
 
-#include "client/linux/microdump_writer/microdump_writer.h"
+#include "linux/microdump_writer/microdump_writer.h"
 
 #include <limits>
 
 #include <sys/utsname.h>
 
-#include "client/linux/dump_writer_common/thread_info.h"
-#include "client/linux/dump_writer_common/ucontext_reader.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/handler/microdump_extra_info.h"
-#include "client/linux/log/log.h"
-#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+#include "linux/dump_writer_common/thread_info.h"
+#include "linux/dump_writer_common/ucontext_reader.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/handler/microdump_extra_info.h"
+#include "linux/log/log.h"
+#include "linux/minidump_writer/linux_ptrace_dumper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/memory.h"
 
 namespace {
 
 using google_breakpad::auto_wasteful_vector;
 using google_breakpad::ExceptionHandler;

rename from toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.h
rename to toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.h
+++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.h
@@ -28,17 +28,17 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_MICRODUMP_WRITER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_MICRODUMP_WRITER_H_
 
 #include <stdint.h>
 #include <sys/types.h>
 
-#include "client/linux/dump_writer_common/mapping_info.h"
+#include "linux/dump_writer_common/mapping_info.h"
 
 namespace google_breakpad {
 
 struct MicrodumpExtraInfo;
 
 // Writes a microdump (a reduced dump containing only the state of the crashing
 // thread) on the console (logcat on Android). These functions do not malloc nor
 // use libc functions which may. Thus, it can be used in contexts where the

rename from toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer_unittest.cc
@@ -31,19 +31,19 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <sstream>
 #include <string>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/handler/microdump_extra_info.h"
-#include "client/linux/microdump_writer/microdump_writer.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/handler/microdump_extra_info.h"
+#include "linux/microdump_writer/microdump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/ignore_ret.h"
 #include "common/scoped_ptr.h"
 #include "common/tests/auto_tempdir.h"
 #include "common/using_std_string.h"
 
 using namespace google_breakpad;
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/cpu_set.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/cpu_set.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/cpu_set_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/cpu_set_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/cpu_set_unittest.cc
@@ -30,17 +30,17 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/minidump_writer/cpu_set.h"
+#include "linux/minidump_writer/cpu_set.h"
 #include "common/linux/tests/auto_testfile.h"
 
 using namespace google_breakpad;
 
 namespace {
 
 typedef testing::Test CpuSetTest;
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/directory_reader.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/directory_reader.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/directory_reader_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/directory_reader_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/directory_reader_unittest.cc
@@ -29,17 +29,17 @@
 
 #include <set>
 #include <string>
 
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include "client/linux/minidump_writer/directory_reader.h"
+#include "linux/minidump_writer/directory_reader.h"
 #include "common/using_std_string.h"
 #include "breakpad_googletest_includes.h"
 
 using namespace google_breakpad;
 
 namespace {
 typedef testing::Test DirectoryReaderTest;
 }

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/line_reader.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/line_reader.h

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/line_reader_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/line_reader_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/line_reader_unittest.cc
@@ -26,17 +26,17 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "client/linux/minidump_writer/line_reader.h"
+#include "linux/minidump_writer/line_reader.h"
 #include "breakpad_googletest_includes.h"
 #include "common/linux/tests/auto_testfile.h"
 
 using namespace google_breakpad;
 
 namespace {
 
 typedef testing::Test LineReaderTest;

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper.cc
@@ -25,17 +25,17 @@
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // linux_core_dumper.cc: Implement google_breakpad::LinuxCoreDumper.
 // See linux_core_dumper.h for details.
 
-#include "client/linux/minidump_writer/linux_core_dumper.h"
+#include "linux/minidump_writer/linux_core_dumper.h"
 
 #include <asm/ptrace.h>
 #include <assert.h>
 #include <elf.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/procfs.h>
 #if defined(__mips__) && defined(__ANDROID__)

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper.h
@@ -29,17 +29,17 @@
 
 // linux_core_dumper.h: Define the google_breakpad::LinuxCoreDumper
 // class, which is derived from google_breakpad::LinuxDumper to extract
 // information from a crashed process via its core dump and proc files.
 
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
 
-#include "client/linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/linux_dumper.h"
 #include "common/linux/elf_core_dump.h"
 #include "common/linux/memory_mapped_file.h"
 
 namespace google_breakpad {
 
 class LinuxCoreDumper : public LinuxDumper {
  public:
   // Constructs a dumper for extracting information of a given process

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_core_dumper_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_core_dumper_unittest.cc
@@ -28,17 +28,17 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // linux_core_dumper_unittest.cc:
 // Unit tests for google_breakpad::LinuxCoreDumoer.
 
 #include <string>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/minidump_writer/linux_core_dumper.h"
+#include "linux/minidump_writer/linux_core_dumper.h"
 #include "common/linux/tests/crash_generator.h"
 #include "common/using_std_string.h"
 
 using namespace google_breakpad;
 
 TEST(LinuxCoreDumperTest, GetMappingAbsolutePath) {
   const LinuxCoreDumper dumper(getpid(), "core", "/tmp", "/mnt/root");
   const MappingInfo mapping = { 0, 0, 0, false, "/usr/lib/libc.so" };

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.cc
@@ -30,26 +30,26 @@
 // linux_dumper.cc: Implement google_breakpad::LinuxDumper.
 // See linux_dumper.h for details.
 
 // This code deals with the mechanics of getting information about a crashed
 // process. Since this code may run in a compromised address space, the same
 // rules apply as detailed at the top of minidump_writer.h: no libc calls and
 // use the alternative allocator.
 
-#include "client/linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/linux_dumper.h"
 
 #include <assert.h>
 #include <elf.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stddef.h>
 #include <string.h>
 
-#include "client/linux/minidump_writer/line_reader.h"
+#include "linux/minidump_writer/line_reader.h"
 #include "common/linux/elfutils.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/linux/memory_mapped_file.h"
 #include "common/linux/safe_readlink.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 #if defined(__ANDROID__)

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.h
@@ -42,18 +42,18 @@
 #if defined(__ANDROID__)
 #include <link.h>
 #endif
 #include <linux/limits.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/user.h>
 
-#include "client/linux/dump_writer_common/mapping_info.h"
-#include "client/linux/dump_writer_common/thread_info.h"
+#include "linux/dump_writer_common/mapping_info.h"
+#include "linux/dump_writer_common/thread_info.h"
 #include "common/linux/file_id.h"
 #include "common/memory.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 // Typedef for our parsing of the auxv variables in /proc/pid/auxv.
 #if defined(__i386) || defined(__ARM_EABI__) || \

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper_unittest_helper.cc

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper.cc
@@ -31,17 +31,17 @@
 // See linux_ptrace_dumper.h for detals.
 // This class was originally splitted from google_breakpad::LinuxDumper.
 
 // This code deals with the mechanics of getting information about a crashed
 // process. Since this code may run in a compromised address space, the same
 // rules apply as detailed at the top of minidump_writer.h: no libc calls and
 // use the alternative allocator.
 
-#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+#include "linux/minidump_writer/linux_ptrace_dumper.h"
 
 #include <asm/ptrace.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -49,18 +49,18 @@
 #include <sys/ptrace.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 
 #if defined(__i386)
 #include <cpuid.h>
 #endif
 
-#include "client/linux/minidump_writer/directory_reader.h"
-#include "client/linux/minidump_writer/line_reader.h"
+#include "linux/minidump_writer/directory_reader.h"
+#include "linux/minidump_writer/line_reader.h"
 #include "common/linux/linux_libc_support.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 // Suspends a thread by attaching to it.
 static bool SuspendThread(pid_t pid) {
   // This may fail if the thread has just died or debugged.
   errno = 0;
   if (sys_ptrace(PTRACE_ATTACH, pid, NULL, NULL) != 0 &&

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper.h
@@ -30,17 +30,17 @@
 // linux_ptrace_dumper.h: Define the google_breakpad::LinuxPtraceDumper
 // class, which is derived from google_breakpad::LinuxDumper to extract
 // information from a crashed process via ptrace.
 // This class was originally splitted from google_breakpad::LinuxDumper.
 
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
 
-#include "client/linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/linux_dumper.h"
 
 namespace google_breakpad {
 
 class LinuxPtraceDumper : public LinuxDumper {
  public:
   // Constructs a dumper for extracting information of a given process
   // with a process ID of |pid|.
   explicit LinuxPtraceDumper(pid_t pid);

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
@@ -44,18 +44,18 @@
 #include <sys/prctl.h>
 #include <sys/poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <string>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
-#include "client/linux/minidump_writer/minidump_writer_unittest_utils.h"
+#include "linux/minidump_writer/linux_ptrace_dumper.h"
+#include "linux/minidump_writer/minidump_writer_unittest_utils.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/ignore_ret.h"
 #include "common/linux/safe_readlink.h"
 #include "common/memory.h"
 #include "common/using_std_string.h"
 
 #ifndef PR_SET_PTRACER

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
@@ -38,19 +38,19 @@
 //     libc functions in linux_libc_support.h.
 //   * You may not call syscalls via the libc wrappers. This rule is a subset
 //     of the first rule but it bears repeating. We have direct wrappers
 //     around the system calls in linux_syscall_support.h.
 //   * You may not malloc. There's an alternative allocator in memory.h and
 //     a canonical instance in the LinuxDumper object. We use the placement
 //     new form to allocate objects and we don't delete them.
 
-#include "client/linux/handler/minidump_descriptor.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
-#include "client/minidump_file_writer-inl.h"
+#include "linux/handler/minidump_descriptor.h"
+#include "linux/minidump_writer/minidump_writer.h"
+#include "minidump_file_writer-inl.h"
 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <link.h>
 #include <stdio.h>
 #if defined(__ANDROID__)
 #include <sys/system_properties.h>
@@ -59,25 +59,25 @@
 #include <sys/ucontext.h>
 #include <sys/user.h>
 #include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 
 #include <algorithm>
 
-#include "client/linux/dump_writer_common/thread_info.h"
-#include "client/linux/dump_writer_common/ucontext_reader.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/minidump_writer/cpu_set.h"
-#include "client/linux/minidump_writer/line_reader.h"
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
-#include "client/linux/minidump_writer/proc_cpuinfo_reader.h"
-#include "client/minidump_file_writer.h"
+#include "linux/dump_writer_common/thread_info.h"
+#include "linux/dump_writer_common/ucontext_reader.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/minidump_writer/cpu_set.h"
+#include "linux/minidump_writer/line_reader.h"
+#include "linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/linux_ptrace_dumper.h"
+#include "linux/minidump_writer/proc_cpuinfo_reader.h"
+#include "minidump_file_writer.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/minidump_type_helper.h"
 #include "google_breakpad/common/minidump_format.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 namespace {
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.h
@@ -33,17 +33,17 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <unistd.h>
 
 #include <list>
 #include <utility>
 
-#include "client/linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/linux_dumper.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 class ExceptionHandler;
 
 #if defined(__aarch64__)
 typedef struct fpsimd_context fpstate_t;

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest.cc
@@ -33,20 +33,20 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <ucontext.h>
 #include <unistd.h>
 
 #include <string>
 
 #include "breakpad_googletest_includes.h"
-#include "client/linux/handler/exception_handler.h"
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "client/linux/minidump_writer/minidump_writer.h"
-#include "client/linux/minidump_writer/minidump_writer_unittest_utils.h"
+#include "linux/handler/exception_handler.h"
+#include "linux/minidump_writer/linux_dumper.h"
+#include "linux/minidump_writer/minidump_writer.h"
+#include "linux/minidump_writer/minidump_writer_unittest_utils.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/ignore_ret.h"
 #include "common/linux/safe_readlink.h"
 #include "common/scoped_ptr.h"
 #include "common/tests/auto_tempdir.h"
 #include "common/tests/file_utils.h"
 #include "common/using_std_string.h"

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest_utils.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest_utils.cc
@@ -23,22 +23,22 @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // minidump_writer_unittest_utils.cc:
-// Shared routines used by unittests under client/linux/minidump_writer.
+// Shared routines used by unittests under linux/minidump_writer.
 
 #include <limits.h>
 #include <stdlib.h>
 
-#include "client/linux/minidump_writer/minidump_writer_unittest_utils.h"
+#include "linux/minidump_writer/minidump_writer_unittest_utils.h"
 #include "common/linux/safe_readlink.h"
 #include "common/using_std_string.h"
 
 namespace google_breakpad {
 
 string GetHelperBinary() {
   string helper_path;
   char *bindir = getenv("bindir");

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest_utils.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer_unittest_utils.h
@@ -23,17 +23,17 @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // minidump_writer_unittest_utils.h:
-// Shared routines used by unittests under client/linux/minidump_writer.
+// Shared routines used by unittests under linux/minidump_writer.
 
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_MINIDUMP_WRITER_UNITTEST_UTILS_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_MINIDUMP_WRITER_UNITTEST_UTILS_H_
 
 #include <string>
 
 #include "common/using_std_string.h"
 

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader.h
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/proc_cpuinfo_reader.h
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader.h
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/proc_cpuinfo_reader.h
@@ -29,17 +29,17 @@
 
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_PROC_CPUINFO_READER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_PROC_CPUINFO_READER_H_
 
 #include <stdint.h>
 #include <assert.h>
 #include <string.h>
 
-#include "client/linux/minidump_writer/line_reader.h"
+#include "linux/minidump_writer/line_reader.h"
 #include "common/linux/linux_libc_support.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 namespace google_breakpad {
 
 // A class for reading /proc/cpuinfo without using fopen/fgets or other
 // functions which may allocate memory.
 class ProcCpuInfoReader {

rename from toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
rename to toolkit/crashreporter/breakpad-client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc
@@ -29,17 +29,17 @@
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
-#include "client/linux/minidump_writer/proc_cpuinfo_reader.h"
+#include "linux/minidump_writer/proc_cpuinfo_reader.h"
 #include "breakpad_googletest_includes.h"
 #include "common/linux/tests/auto_testfile.h"
 
 using namespace google_breakpad;
 
 #if !defined(__ANDROID__)
 #define TEMPDIR "/tmp"
 #else

rename from toolkit/crashreporter/google-breakpad/src/client/linux/moz.build
rename to toolkit/crashreporter/breakpad-client/linux/moz.build

rename from toolkit/crashreporter/google-breakpad/src/client/linux/sender/google_crash_report_sender.cc
rename to toolkit/crashreporter/breakpad-client/linux/sender/google_crash_report_sender.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Breakpad.xcodeproj/project.pbxproj
rename to toolkit/crashreporter/breakpad-client/mac/Breakpad.xcodeproj/project.pbxproj

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.h
rename to toolkit/crashreporter/breakpad-client/mac/Framework/Breakpad.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad.mm
rename to toolkit/crashreporter/breakpad-client/mac/Framework/Breakpad.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Breakpad_Prefix.pch
rename to toolkit/crashreporter/breakpad-client/mac/Framework/Breakpad_Prefix.pch

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/Framework/Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.h
rename to toolkit/crashreporter/breakpad-client/mac/Framework/OnDemandServer.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/Framework/OnDemandServer.mm
rename to toolkit/crashreporter/breakpad-client/mac/Framework/OnDemandServer.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/UnitTests-Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/UnitTests-Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/ConfigFile.h
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/ConfigFile.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/ConfigFile.mm
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/ConfigFile.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.h
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/Inspector.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Inspector.mm
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/Inspector.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/InspectorMain.mm
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/InspectorMain.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/client_info.h
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/client_info.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_client.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_client.cc
@@ -22,19 +22,19 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/mac/crash_generation/crash_generation_client.h"
+#include "mac/crash_generation/crash_generation_client.h"
 
-#include "client/mac/crash_generation/crash_generation_server.h"
+#include "mac/crash_generation/crash_generation_server.h"
 #include "common/mac/MachIPC.h"
 
 namespace google_breakpad {
 
 bool CrashGenerationClient::RequestDumpForException(
     int exception_type,
     int exception_code,
     int exception_subcode,

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_client.h
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_client.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_server.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_server.cc
@@ -22,22 +22,22 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/mac/crash_generation/crash_generation_server.h"
+#include "mac/crash_generation/crash_generation_server.h"
 
 #include <pthread.h>
 
-#include "client/mac/crash_generation/client_info.h"
-#include "client/mac/handler/minidump_generator.h"
+#include "mac/crash_generation/client_info.h"
+#include "mac/handler/minidump_generator.h"
 #include "common/mac/scoped_task_suspend-inl.h"
 
 namespace google_breakpad {
 
 CrashGenerationServer::CrashGenerationServer(
     const char *mach_port_name,
     FilterCallback filter,
     void *filter_context,

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/crash_generation_server.h
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/crash_generation_server.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
rename to toolkit/crashreporter/breakpad-client/mac/crash_generation/moz.build
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
+++ b/toolkit/crashreporter/breakpad-client/mac/crash_generation/moz.build
@@ -7,13 +7,14 @@
 UNIFIED_SOURCES += [
     'crash_generation_client.cc',
     'crash_generation_server.cc',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../..',
+    '/toolkit/crashreporter/breakpad-client',
+    '/toolkit/crashreporter/google-breakpad/src',
 ]
 
 if CONFIG['CLANG_CXX']:
     CXXFLAGS += ['-Wno-shadow']

rename from toolkit/crashreporter/google-breakpad/src/client/mac/gcov/libgcov.a
rename to toolkit/crashreporter/breakpad-client/mac/gcov/libgcov.a

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/breakpad_nlist_64.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/breakpad_nlist_64.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/breakpad_nlist_64.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/dynamic_images.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/dynamic_images.cc
@@ -22,17 +22,17 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/mac/handler/dynamic_images.h"
+#include "mac/handler/dynamic_images.h"
 
 extern "C" { // needed to compile on Leopard
   #include <mach-o/nlist.h>
   #include <stdlib.h>
   #include <stdio.h>
 }
 
 #include <assert.h>

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/dynamic_images.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/dynamic_images.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.cc
@@ -30,18 +30,18 @@
 #include <mach/exc.h>
 #include <mach/mig.h>
 #include <pthread.h>
 #include <signal.h>
 #include <TargetConditionals.h>
 
 #include <map>
 
-#include "client/mac/handler/exception_handler.h"
-#include "client/mac/handler/minidump_generator.h"
+#include "mac/handler/exception_handler.h"
+#include "mac/handler/minidump_generator.h"
 #include "common/mac/macho_utilities.h"
 #include "common/mac/scoped_task_suspend-inl.h"
 #include "google_breakpad/common/minidump_exception_mac.h"
 
 #ifndef __EXCEPTIONS
 // This file uses C++ try/catch (but shouldn't). Duplicate the macros from
 // <c++/4.2.1/exception_defines.h> allowing this file to work properly with
 // exceptions disabled even when other C++ libraries are used. #undef the try

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.h
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/exception_handler.h
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/exception_handler.h
@@ -36,21 +36,21 @@
 #ifndef CLIENT_MAC_HANDLER_EXCEPTION_HANDLER_H__
 #define CLIENT_MAC_HANDLER_EXCEPTION_HANDLER_H__
 
 #include <mach/mach.h>
 #include <TargetConditionals.h>
 
 #include <string>
 
-#include "client/mac/handler/ucontext_compat.h"
+#include "mac/handler/ucontext_compat.h"
 #include "common/scoped_ptr.h"
 
 #if !TARGET_OS_IPHONE
-#include "client/mac/crash_generation/crash_generation_client.h"
+#include "mac/crash_generation/crash_generation_client.h"
 #endif
 
 namespace google_breakpad {
 
 using std::string;
 
 struct ExceptionParameters;
 

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/mach_vm_compat.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/mach_vm_compat.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/minidump_generator.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/minidump_generator.cc
@@ -35,29 +35,29 @@
 #include <mach/vm_statistics.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
 #include <sys/sysctl.h>
 #include <sys/resource.h>
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "client/mac/handler/minidump_generator.h"
+#include "mac/handler/minidump_generator.h"
 
 #if defined(HAS_ARM_SUPPORT) || defined(HAS_ARM64_SUPPORT)
 #include <mach/arm/thread_status.h>
 #endif
 #ifdef HAS_PPC_SUPPORT
 #include <mach/ppc/thread_status.h>
 #endif
 #ifdef HAS_X86_SUPPORT
 #include <mach/i386/thread_status.h>
 #endif
 
-#include "client/minidump_file_writer-inl.h"
+#include "minidump_file_writer-inl.h"
 #include "common/mac/file_id.h"
 #include "common/mac/macho_id.h"
 #include "common/mac/string_utilities.h"
 
 using MacStringUtils::ConvertToString;
 using MacStringUtils::IntegerValueAtIndex;
 
 namespace google_breakpad {

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/minidump_generator.h
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_generator.h
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/minidump_generator.h
@@ -32,18 +32,18 @@
 #ifndef CLIENT_MAC_GENERATOR_MINIDUMP_GENERATOR_H__
 #define CLIENT_MAC_GENERATOR_MINIDUMP_GENERATOR_H__
 
 #include <mach/mach.h>
 #include <TargetConditionals.h>
 
 #include <string>
 
-#include "client/mac/handler/ucontext_compat.h"
-#include "client/minidump_file_writer.h"
+#include "mac/handler/ucontext_compat.h"
+#include "minidump_file_writer.h"
 #include "common/memory.h"
 #include "common/mac/macho_utilities.h"
 #include "google_breakpad/common/minidump_format.h"
 
 #include "dynamic_images.h"
 #include "mach_vm_compat.h"
 
 #if !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_test.xcodeproj/project.pbxproj
rename to toolkit/crashreporter/breakpad-client/mac/handler/minidump_test.xcodeproj/project.pbxproj

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_tests32-Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/handler/minidump_tests32-Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/minidump_tests64-Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/handler/minidump_tests64-Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
rename to toolkit/crashreporter/breakpad-client/mac/handler/moz.build
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/moz.build
@@ -12,11 +12,12 @@ UNIFIED_SOURCES += [
 ]
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../..',
+    '/toolkit/crashreporter/breakpad-client',
+    '/toolkit/crashreporter/google-breakpad/src',
 ]
 

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/obj-cTestCases-Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/handler/obj-cTestCases-Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/protected_memory_allocator.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/protected_memory_allocator.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/protected_memory_allocator.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/DynamicImagesTests.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/DynamicImagesTests.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/testcases/DynamicImagesTests.cc
@@ -29,18 +29,18 @@
 //
 //  DynamicImagesTests.cpp
 //  minidump_test
 //
 //  Created by Neal Sidhwaney on 4/17/08.
 //  Copyright 2008 Google Inc. All rights reserved.
 //
 
-#include "client/mac/handler/testcases/DynamicImagesTests.h"
-#include "client/mac/handler/dynamic_images.h"
+#include "mac/handler/testcases/DynamicImagesTests.h"
+#include "mac/handler/dynamic_images.h"
 
 DynamicImagesTests test2(TEST_INVOCATION(DynamicImagesTests,
                                          ReadTaskMemoryTest));
 DynamicImagesTests test3(TEST_INVOCATION(DynamicImagesTests,
                                          ReadLibrariesFromLocalTaskTest));
 
 DynamicImagesTests::DynamicImagesTests(TestInvocation *invocation)
     : TestCase(invocation) {

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/DynamicImagesTests.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/DynamicImagesTests.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/breakpad_nlist_test.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.cc
+++ b/toolkit/crashreporter/breakpad-client/mac/handler/testcases/breakpad_nlist_test.cc
@@ -29,19 +29,19 @@
 //
 //  breakpad_nlist_test.cc
 //  minidump_test
 //
 //  Created by Neal Sidhwaney on 4/13/08.
 //  Copyright 2008 Google Inc. All rights reserved.
 //
 
-#include "client/mac/handler/testcases/breakpad_nlist_test.h"
+#include "mac/handler/testcases/breakpad_nlist_test.h"
 #include <mach-o/nlist.h>
-#include "client/mac/handler/breakpad_nlist_64.h"
+#include "mac/handler/breakpad_nlist_64.h"
 
 BreakpadNlistTest test1(TEST_INVOCATION(BreakpadNlistTest, CompareToNM));
 
 BreakpadNlistTest::BreakpadNlistTest(TestInvocation *invocation)
     : TestCase(invocation) {
 }
 
 

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/breakpad_nlist_test.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/breakpad_nlist_test.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/dwarftests.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/dwarftests.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/dwarftests.mm
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/dwarftests.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/testdata/dump_syms_dwarf_data
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/testdata/dump_syms_dwarf_data

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/testcases/testdata/dump_syms_i386_breakpad.sym
rename to toolkit/crashreporter/breakpad-client/mac/handler/testcases/testdata/dump_syms_i386_breakpad.sym

rename from toolkit/crashreporter/google-breakpad/src/client/mac/handler/ucontext_compat.h
rename to toolkit/crashreporter/breakpad-client/mac/handler/ucontext_compat.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/Breakpad.xib
rename to toolkit/crashreporter/breakpad-client/mac/sender/Breakpad.xib

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/English.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/English.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/English.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/English.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/ReporterIcon.graffle
rename to toolkit/crashreporter/breakpad-client/mac/sender/ReporterIcon.graffle

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender-Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/sender/crash_report_sender-Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.h
rename to toolkit/crashreporter/breakpad-client/mac/sender/crash_report_sender.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.icns
rename to toolkit/crashreporter/breakpad-client/mac/sender/crash_report_sender.icns

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/crash_report_sender.m
rename to toolkit/crashreporter/breakpad-client/mac/sender/crash_report_sender.m

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/da.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/da.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/da.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/de.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/de.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/de.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/es.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/es.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/es.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/fr.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/fr.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/fr.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/goArrow.png
rename to toolkit/crashreporter/breakpad-client/mac/sender/goArrow.png

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/it.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/it.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/it.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/ja.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/ja.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/ja.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/nl.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/nl.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/nl.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/nl.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/no.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/no.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/no.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/no.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/sl.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/sl.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/sl.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/sv.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/sv.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/sv.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/tr.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/tr.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/tr.lproj/Localizable.strings
rename to toolkit/crashreporter/breakpad-client/mac/sender/tr.lproj/Localizable.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/uploader.h
rename to toolkit/crashreporter/breakpad-client/mac/sender/uploader.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/sender/uploader.mm
rename to toolkit/crashreporter/breakpad-client/mac/sender/uploader.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.h
rename to toolkit/crashreporter/breakpad-client/mac/testapp/Controller.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Controller.m
rename to toolkit/crashreporter/breakpad-client/mac/testapp/Controller.m

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/InfoPlist.strings
rename to toolkit/crashreporter/breakpad-client/mac/testapp/English.lproj/InfoPlist.strings

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.xib
rename to toolkit/crashreporter/breakpad-client/mac/testapp/English.lproj/MainMenu.xib

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/Info.plist
rename to toolkit/crashreporter/breakpad-client/mac/testapp/Info.plist

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.h
rename to toolkit/crashreporter/breakpad-client/mac/testapp/TestClass.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/TestClass.mm
rename to toolkit/crashreporter/breakpad-client/mac/testapp/TestClass.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/bomb.icns
rename to toolkit/crashreporter/breakpad-client/mac/testapp/bomb.icns

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/crashInMain
rename to toolkit/crashreporter/breakpad-client/mac/testapp/crashInMain

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/crashduringload
rename to toolkit/crashreporter/breakpad-client/mac/testapp/crashduringload

rename from toolkit/crashreporter/google-breakpad/src/client/mac/testapp/main.m
rename to toolkit/crashreporter/breakpad-client/mac/testapp/main.m

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/BreakpadFramework_Test.mm
rename to toolkit/crashreporter/breakpad-client/mac/tests/BreakpadFramework_Test.mm

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/crash_generation_server_test.cc
rename to toolkit/crashreporter/breakpad-client/mac/tests/crash_generation_server_test.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/exception_handler_test.cc
rename to toolkit/crashreporter/breakpad-client/mac/tests/exception_handler_test.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/minidump_generator_test.cc
rename to toolkit/crashreporter/breakpad-client/mac/tests/minidump_generator_test.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/minidump_generator_test_helper.cc
rename to toolkit/crashreporter/breakpad-client/mac/tests/minidump_generator_test_helper.cc

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/spawn_child_process.h
rename to toolkit/crashreporter/breakpad-client/mac/tests/spawn_child_process.h

rename from toolkit/crashreporter/google-breakpad/src/client/mac/tests/testlogging.h
rename to toolkit/crashreporter/breakpad-client/mac/tests/testlogging.h

rename from toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h
rename to toolkit/crashreporter/breakpad-client/minidump_file_writer-inl.h
--- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer-inl.h
+++ b/toolkit/crashreporter/breakpad-client/minidump_file_writer-inl.h
@@ -31,17 +31,17 @@
 //
 // See minidump_file_writer.h for documentation.
 
 #ifndef CLIENT_MINIDUMP_FILE_WRITER_INL_H__
 #define CLIENT_MINIDUMP_FILE_WRITER_INL_H__
 
 #include <assert.h>
 
-#include "client/minidump_file_writer.h"
+#include "minidump_file_writer.h"
 #include "google_breakpad/common/minidump_size.h"
 
 namespace google_breakpad {
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::Allocate() {
   allocation_state_ = SINGLE_OBJECT;
   return UntypedMDRVA::Allocate(minidump_size<MDType>::size());

rename from toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc
rename to toolkit/crashreporter/breakpad-client/minidump_file_writer.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.cc
+++ b/toolkit/crashreporter/breakpad-client/minidump_file_writer.cc
@@ -32,17 +32,17 @@
 // See minidump_file_writer.h for documentation.
 
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "client/minidump_file_writer-inl.h"
+#include "minidump_file_writer-inl.h"
 #include "common/linux/linux_libc_support.h"
 #include "common/string_conversion.h"
 #if defined(__linux__) && __linux__
 #include "third_party/lss/linux_syscall_support.h"
 #endif
 
 #if defined(__ANDROID__)
 #include <errno.h>

rename from toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h
rename to toolkit/crashreporter/breakpad-client/minidump_file_writer.h

rename from toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer_unittest.cc
rename to toolkit/crashreporter/breakpad-client/minidump_file_writer_unittest.cc

rename from toolkit/crashreporter/google-breakpad/src/client/moz.build
rename to toolkit/crashreporter/breakpad-client/moz.build
--- a/toolkit/crashreporter/google-breakpad/src/client/moz.build
+++ b/toolkit/crashreporter/breakpad-client/moz.build
@@ -6,13 +6,13 @@
 
 SOURCES += [
     'minidump_file_writer.cc',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '..',
+    '/toolkit/crashreporter/google-breakpad/src',
 ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-shadow']

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile
rename to toolkit/crashreporter/breakpad-client/solaris/handler/Makefile

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/exception_handler.cc
rename to toolkit/crashreporter/breakpad-client/solaris/handler/exception_handler.cc

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/exception_handler.h
rename to toolkit/crashreporter/breakpad-client/solaris/handler/exception_handler.h

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/exception_handler_test.cc
rename to toolkit/crashreporter/breakpad-client/solaris/handler/exception_handler_test.cc

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/minidump_generator.cc
rename to toolkit/crashreporter/breakpad-client/solaris/handler/minidump_generator.cc

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/minidump_generator.h
rename to toolkit/crashreporter/breakpad-client/solaris/handler/minidump_generator.h

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/minidump_test.cc
rename to toolkit/crashreporter/breakpad-client/solaris/handler/minidump_test.cc

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
rename to toolkit/crashreporter/breakpad-client/solaris/handler/moz.build

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.cc
rename to toolkit/crashreporter/breakpad-client/solaris/handler/solaris_lwp.cc

rename from toolkit/crashreporter/google-breakpad/src/client/solaris/handler/solaris_lwp.h
rename to toolkit/crashreporter/breakpad-client/solaris/handler/solaris_lwp.h

rename from toolkit/crashreporter/google-breakpad/src/client/windows/breakpad_client.gyp
rename to toolkit/crashreporter/breakpad-client/windows/breakpad_client.gyp

rename from toolkit/crashreporter/google-breakpad/src/client/windows/common/auto_critical_section.h
rename to toolkit/crashreporter/breakpad-client/windows/common/auto_critical_section.h

rename from toolkit/crashreporter/google-breakpad/src/client/windows/common/ipc_protocol.h
rename to toolkit/crashreporter/breakpad-client/windows/common/ipc_protocol.h

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/ReadMe.txt
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/ReadMe.txt

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/client_info.cc
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/client_info.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/client_info.cc
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/client_info.cc
@@ -22,18 +22,18 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/windows/crash_generation/client_info.h"
-#include "client/windows/common/ipc_protocol.h"
+#include "windows/crash_generation/client_info.h"
+#include "windows/common/ipc_protocol.h"
 
 static const wchar_t kCustomInfoProcessUptimeName[] = L"ptime";
 static const size_t kMaxCustomInfoEntries = 4096;
 
 namespace google_breakpad {
 
 ClientInfo::ClientInfo(CrashGenerationServer* crash_server,
                        DWORD pid,

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/client_info.h
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/client_info.h
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/client_info.h
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/client_info.h
@@ -27,17 +27,17 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_WINDOWS_CRASH_GENERATION_CLIENT_INFO_H__
 #define CLIENT_WINDOWS_CRASH_GENERATION_CLIENT_INFO_H__
 
 #include <windows.h>
 #include <dbghelp.h>
-#include "client/windows/common/ipc_protocol.h"
+#include "windows/common/ipc_protocol.h"
 #include "common/scoped_ptr.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 class CrashGenerationServer;
 
 // Abstraction for a crash client process.

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation.gyp
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation.gyp

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_client.cc
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_client.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_client.cc
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_client.cc
@@ -22,20 +22,20 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/windows/crash_generation/crash_generation_client.h"
+#include "windows/crash_generation/crash_generation_client.h"
 #include <cassert>
 #include <utility>
-#include "client/windows/common/ipc_protocol.h"
+#include "windows/common/ipc_protocol.h"
 
 namespace google_breakpad {
 
 const int kPipeBusyWaitTimeoutMs = 2000;
 
 #ifdef _DEBUG
 const DWORD kWaitForServerTimeoutMs = INFINITE;
 #else

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_client.h
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_client.h
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_client.h
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_client.h
@@ -29,17 +29,17 @@
 
 #ifndef CLIENT_WINDOWS_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_
 #define CLIENT_WINDOWS_CRASH_GENERATION_CRASH_GENERATION_CLIENT_H_
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <string>
 #include <utility>
-#include "client/windows/common/ipc_protocol.h"
+#include "windows/common/ipc_protocol.h"
 #include "common/scoped_ptr.h"
 
 namespace google_breakpad {
 
 struct CustomClientInfo;
 
 // Abstraction of client-side implementation of out of process
 // crash generation.

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_server.cc
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_server.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_server.cc
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_server.cc
@@ -22,24 +22,24 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/windows/crash_generation/crash_generation_server.h"
+#include "windows/crash_generation/crash_generation_server.h"
 #include <windows.h>
 #include <cassert>
 #include <list>
-#include "client/windows/common/auto_critical_section.h"
+#include "windows/common/auto_critical_section.h"
 #include "common/scoped_ptr.h"
 
-#include "client/windows/crash_generation/client_info.h"
+#include "windows/crash_generation/client_info.h"
 
 namespace google_breakpad {
 
 // Output buffer size.
 static const size_t kOutBufferSize = 64;
 
 // Input buffer size.
 static const size_t kInBufferSize = 64;

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_server.h
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_server.h
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation_server.h
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/crash_generation_server.h
@@ -27,18 +27,18 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_WINDOWS_CRASH_GENERATION_CRASH_GENERATION_SERVER_H__
 #define CLIENT_WINDOWS_CRASH_GENERATION_CRASH_GENERATION_SERVER_H__
 
 #include <list>
 #include <string>
-#include "client/windows/common/ipc_protocol.h"
-#include "client/windows/crash_generation/minidump_generator.h"
+#include "windows/common/ipc_protocol.h"
+#include "windows/crash_generation/minidump_generator.h"
 #include "common/scoped_ptr.h"
 
 namespace google_breakpad {
 class ClientInfo;
 
 // Abstraction for server side implementation of out-of-process crash
 // generation protocol for Windows platform only. It generates Windows
 // minidump files for client processes that request dump generation. When

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/minidump_generator.cc
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/minidump_generator.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/minidump_generator.cc
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/minidump_generator.cc
@@ -22,27 +22,27 @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "client/windows/crash_generation/minidump_generator.h"
+#include "windows/crash_generation/minidump_generator.h"
 
 #include <assert.h>
 #include <avrfsdk.h>
 
 #include <algorithm>
 #include <iterator>
 #include <list>
 #include <vector>
 
-#include "client/windows/common/auto_critical_section.h"
+#include "windows/common/auto_critical_section.h"
 #include "common/scoped_ptr.h"
 #include "common/windows/guid_string.h"
 
 using std::wstring;
 
 namespace {
 
 // A helper class used to collect handle operations data. Unlike

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/minidump_generator.h
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/minidump_generator.h

rename from toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild
rename to toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild
+++ b/toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild
@@ -6,12 +6,12 @@
 
 lobjs_crash_generation = [
     'client_info.cc',
     'crash_generation_client.cc',
     'crash_generation_server.cc',
     'minidump_generator.cc',
 ]
 
-subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation'
+subdir = 'toolkit/crashreporter/breakpad-client/windows/crash_generation'
 objs_crash_generation = [
     '/%s/%s' % (subdir, s) for s in lobjs_crash_generation
 ]

rename from toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.cc
rename to toolkit/crashreporter/breakpad-client/windows/handler/exception_handler.cc
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.cc
+++ b/toolkit/crashreporter/breakpad-client/windows/handler/exception_handler.cc
@@ -30,18 +30,18 @@
 #include <objbase.h>
 
 #include <algorithm>
 #include <cassert>
 #include <cstdio>
 
 #include "common/windows/string_utils-inl.h"
 
-#include "client/windows/common/ipc_protocol.h"
-#include "client/windows/handler/exception_handler.h"
+#include "windows/common/ipc_protocol.h"
+#include "windows/handler/exception_handler.h"
 #include "common/windows/guid_string.h"
 
 namespace google_breakpad {
 
 // This is passed as the context to the MinidumpWriteDump callback.
 typedef struct {
   AppMemoryList::const_iterator iter;
   AppMemoryList::const_iterator end;

rename from toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.gyp
rename to toolkit/crashreporter/breakpad-client/windows/handler/exception_handler.gyp

rename from toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.h
rename to toolkit/crashreporter/breakpad-client/windows/handler/exception_handler.h
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.h
+++ b/toolkit/crashreporter/breakpad-client/windows/handler/exception_handler.h
@@ -64,18 +64,18 @@
 #pragma warning(push)
 // Disable exception handler warnings.
 #pragma warning(disable:4530)
 
 #include <list>
 #include <string>
 #include <vector>
 
-#include "client/windows/common/ipc_protocol.h"
-#include "client/windows/crash_generation/crash_generation_client.h"
+#include "windows/common/ipc_protocol.h"
+#include "windows/crash_generation/crash_generation_client.h"
 #include "common/scoped_ptr.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
 
 using std::vector;
 using std::wstring;
 

rename from toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild
rename to toolkit/crashreporter/breakpad-client/windows/handler/objs.mozbuild
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild
+++ b/toolkit/crashreporter/breakpad-client/windows/handler/objs.mozbuild
@@ -3,12 +3,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 lobjs_handler = [
     'exception_handler.cc',
 ]
 
-subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/handler'
+subdir = 'toolkit/crashreporter/breakpad-client/windows/handler'
 objs_handler = [
     '/%s/%s' % (subdir, s) for s in lobjs_handler
 ]