Update deps in extensions/browser/BUILD.gn to pass gn check.

extensions/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//extensions/features/features.gni")
 
-source_set("browser") {
+group("browser") {
+  public_deps = [
+    "//extensions/browser:browser_context_keyed_service_factories",
+    "//extensions/browser:browser_sources",
+    "//extensions/browser/api:api_registration",
+  ]
+
+  if (enable_extensions) {

[Devlin, 2017/02/13 16:07:21]

what includes extensions/* when enable_extensions is false?  We have a good
number of asserts to try and make sure this doesn't happen, e.g.
https://chromium.googlesource.com/chromium/src/+/28ff32abc83ae8939f56702151b3....
 Where does this fail?

[michaelpg, 2017/02/13 21:08:42]

Dunno, maybe nowhere. But I don't want to remove this existing check (moved from
below) in combination with this re-grouping. 

In fact there's already a TODO for this (also moved from below). It may already
be toDONE, but there are other configs I can't check right now (Win/Mac).

[Devlin, 2017/02/13 22:15:12]

Hmm... okay.  But let's look into this soon.

+    # Includes all API implementations and the ExtensionsApiClient
+    # interface. Moving an API from src/chrome to src/extensions implies
+    # it can be cleanly disabled with enable_extensions=false.
+    # TODO: Eventually the entire extensions module should not be built
+    # when enable_extensions=false.
+    public_deps += [ "//extensions/browser/api" ]
+  }
+}
+
+# Isolate the browser's dependency on APIs to the class that instantiates them.

[Devlin, 2017/02/13 16:07:21]

Nit: This isn't a class.  Also, not all of these are API-related.  Maybe just
// Isolate the instantiation of BrowserContextKeyedServices.
?

[michaelpg, 2017/02/13 21:08:42]

Done.

+source_set("browser_context_keyed_service_factories") {
+  visibility = [ ":*" ]
+
+  sources = [
+    "browser_context_keyed_service_factories.cc",
+    "browser_context_keyed_service_factories.h",
+  ]
+
+  deps = [
+    "//extensions/browser:browser_sources",
+    "//extensions/browser/api:api",
+  ]
+}
+
+source_set("browser_sources") {
+  visibility = [ "./*" ]
+
   sources = []
 
   deps = [
     "//base:i18n",
     "//components/cast_certificate",
     "//components/guest_view/browser",
     "//components/keyed_service/content",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/sessions",
     "//components/update_client",
     "//components/version_info",
     "//components/web_cache/browser",
     "//components/web_modal",
     "//components/zoom",
     "//content/public/browser",
+    "//content/public/common",
     "//crypto:platform",
-    "//extensions/browser/api:api_registration",
     "//extensions/common",
     "//extensions/common/api",
     "//extensions/features",
     "//extensions/strings",
     "//google_apis",
     "//ui/display",
   ]
 
   configs += [
     "//build/config:precompiled_headers",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   if (enable_extensions) {
-    # Includes all API implementations and the ExtensionsApiClient
-    # interface. Moving an API from src/chrome to src/extensions implies
-    # it can be cleanly disabled with enable_extensions=false.
-    # TODO: Eventually the entire extensions module should not be built
-    # when enable_extensions=false.
     sources = [
-      # NOTE: When moving an API out of Chrome be sure to verify that the
-      # Android build still compiles. See conditions below.
       "api_activity_monitor.cc",
       "api_activity_monitor.h",
       "app_sorting.h",
       "bad_message.cc",
       "bad_message.h",
       "blacklist_state.h",
       "blob_holder.cc",
       "blob_holder.h",
       "blocked_action_type.h",
       "browser_context_keyed_api_factory.h",
-      "browser_context_keyed_service_factories.cc",
-      "browser_context_keyed_service_factories.h",
       "component_extension_resource_manager.h",
       "computed_hashes.cc",
       "computed_hashes.h",
       "content_hash_fetcher.cc",
       "content_hash_fetcher.h",
       "content_hash_reader.cc",
       "content_hash_reader.h",
       "content_hash_tree.cc",
       "content_hash_tree.h",
       "content_verifier.cc",
@@ skipping 174 matching lines @@
       "warning_service.h",
       "warning_service_factory.cc",
       "warning_service_factory.h",
       "warning_set.cc",
       "warning_set.h",
       "web_ui_user_script_loader.cc",
       "web_ui_user_script_loader.h",
     ]
 
     public_deps = [
-      "//extensions/browser/api",
       "//extensions/browser/app_window",
       "//extensions/browser/guest_view",
       "//extensions/browser/install",
       "//extensions/browser/kiosk",
       "//extensions/browser/updater",
       "//extensions/browser/value_store",
     ]
 
     deps += [
-      "//components/browsing_data/content",
-      "//components/onc",
-      "//components/storage_monitor",
+      "//components/crx_file",
+      "//components/prefs",
+      "//components/sync",
       "//components/update_client",
       "//components/variations",
       "//crypto:platform",
-      "//device/base",
-      "//device/bluetooth",
-      "//device/hid",
-      "//device/power_save_blocker",
-      "//device/serial",
-      "//device/usb",
       "//extensions:extensions_browser_resources",
       "//extensions/common:mojo",
       "//services/service_manager/public/cpp",
     ]
-
-    if (is_chromeos) {
-      deps += [ "//chromeos" ]
-    }
   }
 }
 
 source_set("browser_tests") {
   testonly = true
   sources = [
     "api/audio/audio_apitest.cc",
     "api/bluetooth_socket/bluetooth_socket_apitest.cc",
     "api/display_source/display_source_apitest.cc",
     "api/display_source/display_source_apitestbase.cc",
@@ skipping 152 matching lines @@
     "//net:test_support",
     "//third_party/leveldatabase",
     "//third_party/zlib:zip",
   ]
 
   if (is_chromeos) {
     sources += [ "api/webcam_private/visca_webcam_unittest.cc" ]
     deps += [ "//chromeos:test_support" ]
   }
 }