Cleanup blimp/client/core code organization.

blimp/client/core/context/BUILD.gn

Index: blimp/client/core/context/BUILD.gn
diff --git a/blimp/client/core/BUILD.gn b/blimp/client/core/context/BUILD.gn
similarity index 50%
copy from blimp/client/core/BUILD.gn
copy to blimp/client/core/context/BUILD.gn
index 5888f07e43a597fb3df259f8a2824d9802ad426e..a44b0af32eae49f7f3a5df0f3e72d8edf7602412 100644
--- a/blimp/client/core/BUILD.gn
+++ b/blimp/client/core/context/BUILD.gn
@@ -7,89 +7,6 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-import("//blimp/client/core/config.gni")
-
-# This target is here to let //chrome depend on //blimp/client/public
-# and automatically get the correct implementation of //blimp/client/core
-# depending on whether enable_blimp_client is set or not.
-group("core_shim") {
-  visibility = [ "//blimp/client/public" ]
-
-  if (enable_blimp_client) {
-    deps = [
-      ":core",
-    ]
-  } else {
-    deps = [
-      ":dummy_core",
-    ]
-  }
-}
-
-group("core") {
-  visibility = [
-    "//blimp/client/*",
-    "//blimp/test/*",
-  ]
-
-  deps = [
-    ":context",
-    ":switches",
-    "//blimp/client/core/compositor",
-    "//blimp/client/core/contents",
-    "//blimp/client/core/geolocation",
-    "//blimp/client/core/render_widget",
-    "//blimp/client/core/session",
-    "//blimp/client/core/settings",
-  ]
-}
-
-source_set("dummy_core") {
-  visibility = [ ":*" ]
-
-  sources = [
-    "dummy_blimp_client_context.cc",
-    "dummy_blimp_client_context.h",
-  ]
-
-  deps = [
-    "//base",
-    "//blimp/client/public:public_headers",
-    "//url",
-  ]
-
-  if (is_android) {
-    sources += [
-      "android/dummy_blimp_client_context_android.cc",
-      "android/dummy_blimp_client_context_android.h",
-      "android/dummy_blimp_jni_registrar.cc",
-    ]
-
-    deps += [ ":dummy_core_jni_headers" ]
-  }
-}
-
-source_set("unit_tests") {
-  testonly = true
-
-  sources = [
-    "blimp_client_context_impl_unittest.cc",
-  ]
-
-  deps = [
-    ":context",
-    "//blimp/client/core/compositor:unit_tests",
-    "//blimp/client/core/contents:unit_tests",
-    "//blimp/client/core/geolocation:unit_tests",
-    "//blimp/client/core/render_widget:unit_tests",
-    "//blimp/client/core/session:unit_tests",
-    "//blimp/client/public:public_headers",
-    "//blimp/client/test",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
-}
-
 source_set("context") {
   sources = [
     "blimp_client_context_impl.cc",
@@ -107,9 +24,9 @@ source_set("context") {
   ]
 
   deps = [
-    ":switches",
     "//blimp/client/core/geolocation",
     "//blimp/client/core/settings",
+    "//blimp/client/core/switches",
   ]
 
   if (is_android) {
@@ -127,98 +44,75 @@ source_set("context") {
   }
 }
 
-source_set("switches") {
-  visibility = [
-    "//blimp/client/*",
-    "//blimp/engine:browser_tests",
-  ]
+source_set("dummy_context") {

[David Trainor- moved to gerrit, 2016/09/29 20:03:51]

"dummy" might be more straightforward.  We're already in "context."  wdyt?

[nyquist, 2016/09/29 21:48:24]

I think yes.

+  visibility = [ "//blimp/client/core:dummy_core" ]
 
   sources = [
-    "blimp_client_switches.cc",
-    "blimp_client_switches.h",
+    "dummy_blimp_client_context.cc",
+    "dummy_blimp_client_context.h",
   ]
-}
 
-if (is_android) {
-  # This target is here to let //chrome depend on
-  # //blimp/client/public:public_java and automatically get the correct
-  # implementation of //blimp/client/core depending on whether
-  # enable_blimp_client is set or not.
-  java_group("core_shim_java") {
-    visibility = [ "//blimp/client/public/*" ]
-
-    if (enable_blimp_client) {
-      deps = [
-        ":core_java",
-      ]
-    } else {
-      deps = [
-        ":dummy_core_java",
-      ]
-    }
-  }
+  deps = [
+    "//base",
+    "//blimp/client/public:public_headers",
+    "//url",
+  ]
 
-  java_group("core_java") {
-    visibility = [
-      "//blimp/client/*",
-      "//blimp:blimp_unittests_java_deps",
+  if (is_android) {
+    sources += [
+      "android/dummy_blimp_client_context_android.cc",
+      "android/dummy_blimp_client_context_android.h",
+      "android/dummy_blimp_jni_registrar.cc",
     ]
 
-    deps = [
-      ":context_java",
-      ":switches_java",
-      "//blimp/client/core/contents:contents_java",
-      "//blimp/client/core/settings:settings_java",
-      "//device/geolocation:geolocation_java",
-    ]
+    deps += [ ":dummy_context_jni_headers" ]
   }
+}
 
-  android_library("dummy_core_java") {
-    visibility = [ ":*" ]
+source_set("unit_tests") {
+  testonly = true
 
-    java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java" ]
+  sources = [
+    "blimp_client_context_impl_unittest.cc",
+  ]
 
-    deps = [
-      "//base:base_java",
-      "//blimp/client/public:public_headers_java",
-      "//ui/android:ui_java",
-    ]
-  }
+  deps = [
+    ":context",
+    "//blimp/client/public:public_headers",
+    "//blimp/client/test",
+    "//testing/gtest",
+  ]
+}
 
+if (is_android) {
   android_library("context_java") {
     visibility = [ "//blimp/client/*" ]
 
     java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java" ]
 
     deps = [
-      ":common_java",
-      ":switches_java",
       "//base:base_java",
+      "//blimp/client/core/common:common_java",
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/core/settings:settings_java",
+      "//blimp/client/core/switches:switches_java",
       "//blimp/client/public:public_headers_java",
       "//ui/android:ui_java",
     ]
   }
 
-  android_library("common_java") {
+  android_library("dummy_context_java") {
     visibility = [ "//blimp/client/*" ]
 
-    java_files = [ "android/java/src/org/chromium/blimp/core/settings/PreferencesUtil.java" ]
+    java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java" ]
 
     deps = [
       "//base:base_java",
       "//blimp/client/public:public_headers_java",
+      "//ui/android:ui_java",
     ]
   }
 
-  android_library("switches_java") {
-    visibility = [ "//blimp/client/*" ]
-
-    java_files =
-        [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
-  }
-
   generate_jni("context_jni_headers") {
     visibility = [ ":*" ]
 
@@ -229,7 +123,7 @@ if (is_android) {
     jni_package = "blimp/client/core"
   }
 
-  generate_jni("dummy_core_jni_headers") {
+  generate_jni("dummy_context_jni_headers") {
     visibility = [ ":*" ]
 
     sources = [