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

blimp/client/core/contents/android/blimp_contents_jni_registrar.cc

Index: blimp/client/core/contents/android/blimp_contents_jni_registrar.cc
diff --git a/blimp/client/core/android/blimp_jni_registrar.cc b/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc
similarity index 51%
copy from blimp/client/core/android/blimp_jni_registrar.cc
copy to blimp/client/core/contents/android/blimp_contents_jni_registrar.cc
index 6673e3a79048e4d8d32e027c06b29f77e689e34c..0b9076fc2ae5654bf891b2276c313ac80cda9be4 100644
--- a/blimp/client/core/android/blimp_jni_registrar.cc
+++ b/blimp/client/core/contents/android/blimp_contents_jni_registrar.cc
@@ -2,22 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/public/android/blimp_jni_registrar.h"
+#include "blimp/client/core/contents/android/blimp_contents_jni_registrar.h"
 
 #include "base/android/jni_registrar.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 "blimp/client/core/contents/android/blimp_contents_factory.h"
+#include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
+#include "blimp/client/core/contents/android/blimp_contents_observer_proxy.h"
+#include "blimp/client/core/contents/android/blimp_navigation_controller_impl_android.h"
 
 namespace blimp {
 namespace client {
 namespace {
 
 base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
-    {"BlimpClientContextImplAndroid",
-     BlimpClientContextImplAndroid::RegisterJni},
     {"BlimpContentsFactory", RegisterBlimpContentsFactoryJni},
     {"BlimpContentsImplAndroid", BlimpContentsImplAndroid::RegisterJni},
     {"BlimpContentsObserverProxy", BlimpContentsObserverProxy::RegisterJni},
@@ -27,11 +24,7 @@ base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
 
 }  // 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) {
+bool RegisterBlimpContentsJni(JNIEnv* env) {
   return base::android::RegisterNativeMethods(
       env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods));
 }