Move font_warmup_win, fix webrtc dep.

font_warmup_win.cc depends on Blink code but is linked into content/common. This file is not needed outside of child processes, so it can go in content/child and avoid the blink-in-browser usage.

Removes the linux conditional on libjingle_webrtc and make it apply whenever webrtc is being used. This code is called by socket_host.cc whenever webrtc is enabled. This is necessary for a future patch that removes Blink's linking into content/browser. Blink is currently bringing in webrtc which is why the code links today.

BUG=582206

Review URL: https://codereview.chromium.org/1642213002

Cr-Commit-Position: refs/heads/master@{#372210}

12 files changed, 17 insertions, 17 deletions

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index b83884b..426bc69 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -192,10 +192,10 @@ source_set("browser") {
     sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources,
                            ".",
                            "//content")
-    deps += [ "//jingle:jingle_glue" ]
-    if (is_linux) {
-      deps += [ "//third_party/libjingle:libjingle_webrtc" ]
-    }
+    deps += [
+      "//jingle:jingle_glue",
+      "//third_party/libjingle:libjingle_webrtc",
+    ]
     if (is_linux || is_mac || is_win) {
       sources += [
         "media/capture/desktop_capture_device.cc",
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
index 7ec2a42..9ffd8dd 100644
--- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
+++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
@@ -12,7 +12,7 @@
 #include "base/win/iat_patch_function.h"
 #include "base/win/windows_version.h"
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_win.h"
-#include "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
diff --git a/content/common/font_warmup_win.cc b/content/child/font_warmup_win.cc
index 2968218..be532df 100644
--- a/content/common/font_warmup_win.cc
+++ b/content/child/font_warmup_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 "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 
 #include <dwrite.h>
 #include <stdint.h>
diff --git a/content/common/font_warmup_win.h b/content/child/font_warmup_win.h
index 8539b9e..bd1ae69 100644
--- a/content/common/font_warmup_win.h
+++ b/content/child/font_warmup_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 CONTENT_COMMON_FONT_WARMUP_WIN_H_
-#define CONTENT_COMMON_FONT_WARMUP_WIN_H_
+#ifndef CONTENT_CHILD_FONT_WARMUP_WIN_H_
+#define CONTENT_CHILD_FONT_WARMUP_WIN_H_
 
 #include <stddef.h>
 
@@ -73,4 +73,4 @@ CONTENT_EXPORT void PatchServiceManagerCalls();
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_FONT_WARMUP_WIN_H_
+#endif  // CONTENT_CHILD_FONT_WARMUP_WIN_H_
diff --git a/content/common/font_warmup_win_unittest.cc b/content/child/font_warmup_win_unittest.cc
index 362373fd..fd85d58f 100644
--- a/content/common/font_warmup_win_unittest.cc
+++ b/content/child/font_warmup_win_unittest.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 "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 5198c91..62d84ec 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -98,6 +98,8 @@
       'child/fileapi/webfilewriter_base.h',
       'child/fileapi/webfilewriter_impl.cc',
       'child/fileapi/webfilewriter_impl.h',
+      'child/font_warmup_win.cc',
+      'child/font_warmup_win.h',
       'child/ftp_directory_listing_response_delegate.cc',
       'child/ftp_directory_listing_response_delegate.h',
       'child/geofencing/geofencing_dispatcher.cc',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 063a70f..f9666d4 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -273,8 +273,6 @@
       'common/font_list_ozone.cc',
       'common/font_list_pango.cc',
       'common/font_list_win.cc',
-      'common/font_warmup_win.cc',
-      'common/font_warmup_win.h',
       'common/frame_message_enums.h',
       'common/frame_messages.h',
       'common/frame_param.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f8e681d..9fb66ec 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -633,6 +633,7 @@
       'child/blob_storage/blob_transport_controller_unittest.cc',
       'child/dwrite_font_proxy/dwrite_font_proxy_win_unittest.cc',
       'child/fileapi/webfilewriter_base_unittest.cc',
+      'child/font_warmup_win_unittest.cc',
       'child/indexed_db/indexed_db_dispatcher_unittest.cc',
       'child/indexed_db/mock_webidbcallbacks.cc',
       'child/indexed_db/mock_webidbcallbacks.h',
@@ -664,7 +665,6 @@
       'common/dwrite_font_platform_win_unittest.cc',
       'common/experiments/api_key_unittest.cc',
       'common/fileapi/file_system_util_unittest.cc',
-      'common/font_warmup_win_unittest.cc',
       'common/gpu/client/gpu_memory_buffer_impl_shared_memory_unittest.cc',
       'common/gpu/gpu_channel_manager_unittest.cc',
       'common/gpu/gpu_channel_test_common.cc',
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 53bd14c..9569403 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -29,7 +29,7 @@
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
-#include "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "sandbox/win/src/sandbox.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index c1cd080..f9d5cff 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -55,7 +55,7 @@
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
-#include "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 #include "sandbox/win/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "content/common/sandbox_init_mac.h"
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index ae7e7e4..e1dd2e3 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -14,7 +14,7 @@
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
-#include "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/injection_test_win.h"
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index c99e56a..bc26200 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -41,7 +41,7 @@
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #elif defined(OS_WIN)
-#include "content/common/font_warmup_win.h"
+#include "content/child/font_warmup_win.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"