Move v8_breakpad_support_win from common to child

Part of removing dependency of Windows browser DLL on v8. R=jochen@chromium.org BUG=581766 Review-Url: https://codereview.chromium.org/2627713007 Cr-Commit-Position: refs/heads/master@{#443244}
qweri0p · Jan 12, 2017 · 66c78e9 · 66c78e9
1 parent bba0e66
commit 66c78e9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
@@ -64,8 +64,8 @@
 #include <algorithm>
 #include "base/debug/close_handle_hook_win.h"
 #include "chrome/browser/downgrade/user_data_downgrade.h"
+#include "chrome/child/v8_breakpad_support_win.h"
 #include "chrome/common/child_process_logging.h"
-#include "chrome/common/v8_breakpad_support_win.h"
 #include "components/crash/content/app/crashpad.h"
 #include "sandbox/win/src/sandbox.h"
 #include "ui/base/resource/resource_bundle_win.h"
@@ -533,7 +533,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
   base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
       base::Bind(&IsTraceEventArgsWhitelisted));
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
   v8_breakpad_support::SetUp();
 #endif
 

diff --git a/chrome/child/BUILD.gn b/chrome/child/BUILD.gn
@@ -6,12 +6,15 @@ static_library("child") {
   sources = [
     "pdf_child_init.cc",
     "pdf_child_init.h",
+    "v8_breakpad_support_win.cc",
+    "v8_breakpad_support_win.h",
   ]
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   deps = [
     "//base",
     "//content/public/child",
+    "//gin",
   ]
 }
diff --git a/chrome/child/DEPS b/chrome/child/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+content/public/child",
+  "+gin",
 ]
diff --git a/chrome/common/v8_breakpad_support_win.cc → chrome/child/v8_breakpad_support_win.cc b/chrome/common/v8_breakpad_support_win.cc → chrome/child/v8_breakpad_support_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/v8_breakpad_support_win.h"
+#include "chrome/child/v8_breakpad_support_win.h"
 
 #include <windows.h>
 

diff --git a/chrome/common/v8_breakpad_support_win.h → chrome/child/v8_breakpad_support_win.h b/chrome/common/v8_breakpad_support_win.h → chrome/child/v8_breakpad_support_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_
-#define CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_
+#ifndef CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
+#define CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
 
 namespace v8_breakpad_support {
 
@@ -12,4 +12,4 @@ void SetUp();
 
 }  // namespace v8_breakpad_support
 
-#endif  // CHROME_COMMON_V8_BREAKPAD_SUPPORT_WIN_H_
+#endif  // CHROME_CHILD_V8_BREAKPAD_SUPPORT_WIN_H_
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
@@ -150,8 +150,6 @@ static_library("common") {
     "tts_utterance_request.h",
     "url_constants.cc",
     "url_constants.h",
-    "v8_breakpad_support_win.cc",
-    "v8_breakpad_support_win.h",
     "web_application_info.cc",
     "web_application_info.h",
     "widevine_cdm_constants.cc",