Add BlimpClientContext and factory with real and dummy implementation

blimp/client/core/android/blimp_jni_registrar.cc

Index: blimp/client/core/android/blimp_jni_registrar.cc
diff --git a/blimp/client/app/android/blimp_jni_registrar.cc b/blimp/client/core/android/blimp_jni_registrar.cc
similarity index 51%
rename from blimp/client/app/android/blimp_jni_registrar.cc
rename to blimp/client/core/android/blimp_jni_registrar.cc
index c0f3fbcdcd51f4e68be429ba3310eb6b240b5f48..6673e3a79048e4d8d32e027c06b29f77e689e34c 100644
--- a/blimp/client/app/android/blimp_jni_registrar.cc
+++ b/blimp/client/core/android/blimp_jni_registrar.cc
@@ -1,43 +1,36 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-#include "blimp/client/app/android/blimp_jni_registrar.h"
+#include "blimp/client/public/android/blimp_jni_registrar.h"
 
 #include "base/android/jni_registrar.h"
-#include "blimp/client/app/android/blimp_client_session_android.h"
-#include "blimp/client/app/android/blimp_library_loader.h"
-#include "blimp/client/app/android/blimp_view.h"
-#include "blimp/client/app/android/tab_control_feature_android.h"
-#include "blimp/client/app/android/toolbar.h"
-#include "blimp/client/app/android/web_input_box.h"
+#include "blimp/client/core/android/blimp_client_context_impl_android.h"
 #include "blimp/client/core/android/blimp_contents_factory.h"
 #include "blimp/client/core/android/blimp_contents_impl_android.h"
 #include "blimp/client/core/android/blimp_contents_observer_proxy.h"
 #include "blimp/client/core/android/blimp_navigation_controller_impl_android.h"
-#include "components/safe_json/android/component_jni_registrar.h"
 
 namespace blimp {
 namespace client {
 namespace {
 
 base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
-    {"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni},
+    {"BlimpClientContextImplAndroid",
+     BlimpClientContextImplAndroid::RegisterJni},
     {"BlimpContentsFactory", RegisterBlimpContentsFactoryJni},
-    {"BlimpContentsImpl", BlimpContentsImplAndroid::RegisterJni},
+    {"BlimpContentsImplAndroid", BlimpContentsImplAndroid::RegisterJni},
     {"BlimpContentsObserverProxy", BlimpContentsObserverProxy::RegisterJni},
-    {"BlimpLibraryLoader", RegisterBlimpLibraryLoaderJni},
     {"BlimpNavigationControllerImplAndroid",
      BlimpNavigationControllerImplAndroid::RegisterJni},
-    {"BlimpView", BlimpView::RegisterJni},
-    {"SafeJson", safe_json::android::RegisterSafeJsonJni},
-    {"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni},
-    {"Toolbar", Toolbar::RegisterJni},
-    {"WebInputBox", WebInputBox::RegisterJni},
 };
 
 }  // namespace
 
+// This method is declared in
+// //blimp/client/public/android/blimp_jni_registrar.h, and either this function
+// or the one in //blimp/client/core/android/dummy_blimp_jni_registrar.cc
+// should be linked in to any binary blimp::client::RegisterBlimpJni.
 bool RegisterBlimpJni(JNIEnv* env) {
   return base::android::RegisterNativeMethods(
       env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods));