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

blimp/client/core/settings/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("settings") {
   visibility = [
-    "//blimp/client/app:*",  # TODO(nyquist): Remove this. See crbug/651964.
     "//blimp/client/core/*",
+    "//blimp/engine:browser_tests",
   ]
 
   sources = [
     "blimp_settings_delegate.h",
     "settings.cc",
     "settings.h",
     "settings_feature.cc",
     "settings_feature.h",
     "settings_observer.h",
     "settings_prefs.cc",
@@ skipping 47 matching lines @@
     "//blimp/client/core/switches:switches",
     "//components/prefs:test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 if (is_android) {
   android_library("settings_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/settings/AboutBlimpPreferences.java",
       "android/java/src/org/chromium/blimp/core/settings/BlimpPreferencesDelegate.java",
       "android/java/src/org/chromium/blimp/core/settings/EmptySettingsObserver.java",
       "android/java/src/org/chromium/blimp/core/settings/Settings.java",
       "android/java/src/org/chromium/blimp/core/settings/SettingsObserver.java",
       "android/java/src/org/chromium/blimp/core/settings/SettingsObserverProxy.java",
@@ skipping 16 matching lines @@
 
     sources = [
       "android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java",
       "android/java/src/org/chromium/blimp/core/settings/Settings.java",
       "android/java/src/org/chromium/blimp/core/settings/SettingsObserverProxy.java",
     ]
 
     jni_package = "blimp/client/core/settings"
   }
 }