Add BlimpClientContext and factory with real and dummy implementation

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 b98e4eb25feb0a456b6ed39da7bd5e76e5a25ba9..b945988fb4727c911b795144d91b32d9ec3f6c14 100644
--- a/blimp/client/core/BUILD.gn
+++ b/blimp/client/core/BUILD.gn
@@ -2,15 +2,23 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//blimp/blimp.gni")
+
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 source_set("core") {

[Dirk Pranke, 2016/07/14 23:25:51]

It seems like it might make more sense to move all of the //blimp/client/dummy
code into this directory, and just
provide the two different definitions of :core so that it's a little clearer
that they're related, e.g.:

if (enable_blimp) {
  source_set("core") { ... }
} else {
  source_set("core") { ... }
}

If you do that, I think you can also just inline the declare_args() block into
this file and not need blimp.gni. Then your consumers can unconditionally depend
on //blimp/client/core and not worry about whether blimp is enabled or not;
we've generally found that this gives you better modularity in the build files.

[nyquist, 2016/07/15 17:38:19]

All done! Thanks for your help!

-  visibility = [ "//blimp/*" ]
+  visibility = [ "//blimp/client/*" ]
+
+  if (enable_blimp) {
+    visibility += [ "//chrome/browser" ]
+  }
 
   sources = [
+    "blimp_client_context_impl.cc",
+    "blimp_client_context_impl.h",
     "blimp_contents_impl.cc",
     "blimp_contents_impl.h",
     "blimp_navigation_controller_delegate.h",
@@ -26,17 +34,20 @@ source_set("core") {
 
   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 += [ "//blimp/client/core:core_jni_headers" ]
+    deps += [ ":core_jni_headers" ]
   }
 }
 
@@ -44,6 +55,7 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
+    "blimp_client_context_impl_unittest.cc",
     "blimp_contents_impl_unittest.cc",
     "blimp_navigation_controller_impl_unittest.cc",
   ]
@@ -52,6 +64,7 @@ source_set("unit_tests") {
     "//base",
     "//blimp/client/core",
     "//blimp/client/public",
+    "//blimp/client/test",
     "//testing/gtest",
     "//url",
   ]
@@ -59,9 +72,14 @@ source_set("unit_tests") {
 
 if (is_android) {
   android_library("core_java") {
-    visibility = [ "//blimp/*" ]
+    visibility = [ "//blimp/client/*" ]
+
+    if (enable_blimp) {
+      visibility += [ "//chrome/android/*" ]
+    }
 
     java_files = [
+      "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",
@@ -76,12 +94,13 @@ if (is_android) {
 
   generate_jni("core_jni_headers") {
     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"
+    jni_package = "blimp/client/core"
   }
 }