Make //blimp/client/app a real embedder of //blimp/client/public

blimp/client/core/contents/BUILD.gn

 # 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.
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 source_set("contents") {
   visibility = [
-    "//blimp/client/app:*",  # TODO(nyquist): Remove this. See crbug/651964.
     "//blimp/client/core/*",
+    "//blimp/engine:browser_tests",
   ]
 
   sources = [
     "blimp_contents_impl.cc",
     "blimp_contents_impl.h",
     "blimp_contents_manager.cc",
     "blimp_contents_manager.h",
     "blimp_contents_view_impl.cc",
     "blimp_contents_view_impl.h",
     "blimp_navigation_controller_delegate.h",
@@ skipping 122 matching lines @@
   ]
 
   if (is_android) {
     deps += [ "//ui/android" ]
   }
 }
 
 if (is_android) {
   android_library("contents_java") {
     visibility = [
-      "//blimp/client/app:*",  # TODO(nyquist): Remove this. See crbug/651964.
+      "//blimp/client/app:blimp_test_java_core_deps",
       "//blimp/client/core/*",
     ]
 
     java_files = [
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
       "android/java/src/org/chromium/blimp/core/contents/input/ImeEditText.java",
       "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java",
@@ skipping 16 matching lines @@
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpContentsObserverProxy.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpNavigationControllerImpl.java",
       "android/java/src/org/chromium/blimp/core/contents/BlimpView.java",
       "android/java/src/org/chromium/blimp/core/contents/input/ImeHelperDialog.java",
     ]
 
     jni_package = "blimp/client/core/contents"
   }
 }