Split //blimp/client/core to relevant parts.

blimp/client/core/BUILD.gn

Index: blimp/client/core/BUILD.gn
diff --git a/blimp/client/core/BUILD.gn b/blimp/client/core/BUILD.gn
index 183941f061548c6d318e60d32359efbe8381f737..1feb9f9fa01a6f2e258dad1460349cb1f58e17e1 100644
--- a/blimp/client/core/BUILD.gn
+++ b/blimp/client/core/BUILD.gn
@@ -30,42 +30,15 @@ group("core_shim") {
   }
 }
 
-source_set("core") {
+group("core") {
   visibility = [ "//blimp/client/*" ]
 
-  sources = [
-    "blimp_client_context_impl.cc",
-    "blimp_client_context_impl.h",
-    "blimp_contents_impl.cc",
-    "blimp_contents_impl.h",
-    "blimp_navigation_controller_delegate.h",
-    "blimp_navigation_controller_impl.cc",
-    "blimp_navigation_controller_impl.h",
-  ]
-
   deps = [
-    "//base",
-    "//blimp/client/public:public_headers",
-    "//url",
+    ":context",
+    ":switches",
+    "//blimp/client/core/contents",
+    "//blimp/client/core/session",
   ]
-
-  if (is_android) {
-    sources += [
-      "android/blimp_client_context_impl_android.cc",
-      "android/blimp_client_context_impl_android.h",
-      "android/blimp_contents_factory.cc",
-      "android/blimp_contents_factory.h",
-      "android/blimp_contents_impl_android.cc",
-      "android/blimp_contents_impl_android.h",
-      "android/blimp_contents_observer_proxy.cc",
-      "android/blimp_contents_observer_proxy.h",
-      "android/blimp_jni_registrar.cc",
-      "android/blimp_navigation_controller_impl_android.cc",
-      "android/blimp_navigation_controller_impl_android.h",
-    ]
-
-    deps += [ ":core_jni_headers" ]
-  }
 }
 
 source_set("dummy_core") {
@@ -98,21 +71,43 @@ source_set("unit_tests") {
 
   sources = [
     "blimp_client_context_impl_unittest.cc",
-    "blimp_contents_impl_unittest.cc",
-    "blimp_navigation_controller_impl_unittest.cc",
   ]
 
   deps = [
-    ":core",
-    "//base",
+    ":context",
+    "//blimp/client/core/contents:unit_tests",
     "//blimp/client/core/session:unit_tests",
     "//blimp/client/public:public_headers",
     "//blimp/client/test",
     "//testing/gtest",
-    "//url",
   ]
 }
 
+source_set("context") {
+  sources = [
+    "blimp_client_context_impl.cc",
+    "blimp_client_context_impl.h",
+  ]
+
+  public_deps = [
+    "//base",
+    "//blimp/client/core/contents",
+    "//blimp/client/public:public_headers",
+  ]
+
+  if (is_android) {
+    sources += [
+      "android/blimp_client_context_impl_android.cc",
+      "android/blimp_client_context_impl_android.h",
+      "android/blimp_jni_registrar.cc",
+    ]
+
+    deps = [
+      ":context_jni_headers",
+    ]
+  }
+}
+
 source_set("switches") {
   visibility = [
     "//blimp/client/*",
@@ -144,17 +139,20 @@ if (is_android) {
     }
   }
 
-  android_library("core_java") {
+  java_group("core_java") {
     visibility = [ "//blimp/client/*" ]
 
-    java_files = [
-      "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java",
-      "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java",
-      "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.java",
+    deps = [
+      ":context_java",
+      ":switches_java",
+      "//blimp/client/core/contents:contents_java",
     ]
+  }
+
+  android_library("dummy_core_java") {
+    visibility = [ ":*" ]
+
+    java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java" ]
 
     deps = [
       "//base:base_java",
@@ -162,26 +160,30 @@ if (is_android) {
     ]
   }
 
-  android_library("dummy_core_java") {
-    visibility = [ ":*" ]
+  android_library("context_java") {
+    visibility = [ "//blimp/client/*" ]
 
-    java_files = [ "android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java" ]
+    java_files = [ "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java" ]
 
     deps = [
       "//base:base_java",
+      "//blimp/client/core/contents:contents_java",
       "//blimp/client/public:public_headers_java",
     ]
   }
 
-  generate_jni("core_jni_headers") {
+  android_library("switches_java") {
+    visibility = [ "//blimp/client/*" ]
+
+    java_files =
+        [ "android/java/src/org/chromium/blimp/core/BlimpClientSwitches.java" ]
+  }
+
+  generate_jni("context_jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
       "android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsFactory.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsImpl.java",
-      "android/java/src/org/chromium/blimp/core/BlimpContentsObserverProxy.java",
-      "android/java/src/org/chromium/blimp/core/BlimpNavigationControllerImpl.java",
     ]
 
     jni_package = "blimp/client/core"