Android: Remove some devtools code from the build.

BUG=159847

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

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

chrome/browser/ui/BUILD.gn

@@ -88,7 +88,6 @@ static_library("ui") {
       "//chrome/installer/util",
       "//components/autofill/content/browser:risk_proto",
       "//components/power",
-      "//device/bluetooth",
       "//device/nfc",
       "//media",
       "//mojo/edk/system",
@@ -124,6 +123,12 @@ static_library("ui") {
     deps += [ "//net" ]
   }
 
+  if (!is_android && !is_ios) {
+    sources += rebase_path(gypi_values.chrome_browser_ui_non_mobile_sources,
+                           ".", "//chrome")
+    deps += [ "//device/bluetooth" ]
+  }
+
   if (printing_mode != 0) {
     deps += [ "//printing" ]
   }

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -23,7 +23,6 @@
 #include "chrome/browser/ui/webui/components_ui.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/crashes_ui.h"
-#include "chrome/browser/ui/webui/devtools_ui.h"
 #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h"
 #include "chrome/browser/ui/webui/downloads_ui.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
@@ -32,7 +31,6 @@
 #include "chrome/browser/ui/webui/help/help_ui.h"
 #include "chrome/browser/ui/webui/history_ui.h"
 #include "chrome/browser/ui/webui/identity_internals_ui.h"
-#include "chrome/browser/ui/webui/inspect_ui.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
 #include "chrome/browser/ui/webui/invalidations_ui.h"
@@ -99,6 +97,9 @@
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 #include "chrome/browser/ui/webui/net_export_ui.h"
+#else
+#include "chrome/browser/ui/webui/devtools_ui.h"
+#include "chrome/browser/ui/webui/inspect_ui.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -354,8 +355,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   // Bookmarks are part of NTP on Android.
   if (url.host() == chrome::kChromeUIBookmarksHost)
     return &NewWebUI<BookmarksUI>;
-  if (url.SchemeIs(content::kChromeDevToolsScheme))
-    return &NewWebUI<DevToolsUI>;
   // Downloads list on Android uses the built-in download manager.
   if (url.host() == chrome::kChromeUIDownloadsHost)
     return &NewWebUI<DownloadsUI>;
@@ -370,11 +369,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
   // Identity API is not available on Android.
   if (url.host() == chrome::kChromeUIIdentityInternalsHost)
     return &NewWebUI<IdentityInternalsUI>;
-  // chrome://inspect isn't supported on Android. Page debugging is handled by a
-  // remote devtools on the host machine, and other elements (Shared Workers,
-  // extensions, etc) aren't supported.
-  if (url.host() == chrome::kChromeUIInspectHost)
-    return &NewWebUI<InspectUI>;
   // Android does not support plugins for now.
   if (url.host() == chrome::kChromeUIPluginsHost)
     return &NewWebUI<PluginsUI>;
@@ -462,6 +456,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   if (url.host() == chrome::kChromeUIChromeSigninHost)
     return &NewWebUI<InlineLoginUI>;
+  if (url.SchemeIs(content::kChromeDevToolsScheme))
+    return &NewWebUI<DevToolsUI>;
+  // chrome://inspect isn't supported on Android nor iOS. Page debugging is
+  // handled by a remote devtools on the host machine, and other elements, i.e.
+  // extensions aren't supported.
+  if (url.host() == chrome::kChromeUIInspectHost)
+    return &NewWebUI<InspectUI>;
 #endif
 
   /****************************************************************************

chrome/chrome_browser_ui.gypi

@@ -1046,8 +1046,6 @@
       'browser/ui/webui/cookies_tree_model_util.h',
       'browser/ui/webui/crashes_ui.cc',
       'browser/ui/webui/crashes_ui.h',
-      'browser/ui/webui/devtools_ui.cc',
-      'browser/ui/webui/devtools_ui.h',
       'browser/ui/webui/domain_reliability_internals_ui.cc',
       'browser/ui/webui/domain_reliability_internals_ui.h',
       'browser/ui/webui/favicon_source.cc',
@@ -1803,6 +1801,10 @@
       'browser/ui/zoom/zoom_controller.cc',
       'browser/ui/zoom/zoom_controller.h',
     ],
+    'chrome_browser_ui_non_mobile_sources': [
+      'browser/ui/webui/devtools_ui.cc',
+      'browser/ui/webui/devtools_ui.h',
+    ],
     'chrome_browser_ui_print_preview_sources': [
       'browser/ui/webui/print_preview/print_preview_handler.cc',
       'browser/ui/webui/print_preview/print_preview_handler.h',
@@ -3038,6 +3040,7 @@
           'dependencies': [
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
           ],
+          'sources': [ '<@(chrome_browser_ui_non_mobile_sources)' ],
         }],
       ],
     },