Move Java Blimp shell code to app subpackage

blimp/client/app/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/ui.gni")
 import("//tools/grit/repack.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 198 matching lines @@
 
     input = "android/javatests/AndroidManifest.xml.jinja2"
     output = blimp_test_apk_manifest
     variables = jinja_variables
   }
 
   generate_jni("jni_headers") {
     visibility = [ ":*" ]
 
     sources = [
-      "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
-      "android/java/src/org/chromium/blimp/BlimpView.java",
-      "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
-      "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
-      "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+      "android/java/src/org/chromium/blimp/app/BlimpContentsDisplay.java",
+      "android/java/src/org/chromium/blimp/app/BlimpLibraryLoader.java",
+      "android/java/src/org/chromium/blimp/app/session/BlimpClientSession.java",
+      "android/java/src/org/chromium/blimp/app/session/TabControlFeature.java",
+      "android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java",
     ]
 
     jni_package = "blimp"
   }
 
   android_resources("blimp_java_resources") {
     visibility = [
       ":*",
       "//blimp/client/core/contents/*",  # TODO(xingliu): Remove this.
       "//blimp/client/core/settings/*",  # TODO(xingliu): Remove this.
     ]
     resource_dirs = [ "android/java/res" ]
     deps = [
       ":blimp_strings_grd",
     ]
-    custom_package = "org.chromium.blimp"
+    custom_package = "org.chromium.blimp.app"
   }
 
   java_strings_grd("blimp_strings_grd") {
     grd_file = "android/java/strings/android_blimp_strings.grd"
     outputs = [
       "values-am/android_blimp_strings.xml",
       "values-ar/android_blimp_strings.xml",
       "values-bg/android_blimp_strings.xml",
       "values-ca/android_blimp_strings.xml",
       "values-cs/android_blimp_strings.xml",
@@ skipping 41 matching lines @@
 
   android_library("blimp_java") {
     visibility = [ ":*" ]
 
     deps = [
       ":blimp_java_resources",
       "//base:base_java",
       "//blimp/client/core:core_java",
       "//blimp/client/public:public_headers_java",
       "//third_party/android_tools:android_support_annotations_java",
+      "//third_party/android_tools:android_support_v7_appcompat_java",
 
       # TODO(dtrainor): Remove the ui_java target once no more Android Toast
       # notifications are used.
       "//ui/android:ui_java",
       google_play_services_library,
     ]
 
     java_files = [
-      "android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
-      "android/java/src/org/chromium/blimp/auth/TokenSource.java",
-      "android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
-      "android/java/src/org/chromium/blimp/BlimpApplication.java",
-      "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
-      "android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
-      "android/java/src/org/chromium/blimp/BlimpView.java",
-      "android/java/src/org/chromium/blimp/BrowserRestartActivity.java",
-      "android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java",
-      "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
-      "android/java/src/org/chromium/blimp/session/EngineInfo.java",
-      "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
-      "android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java",
-      "android/java/src/org/chromium/blimp/settings/Preferences.java",
-      "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
-      "android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java",
-      "android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
+      "android/java/src/org/chromium/blimp/app/auth/RetryingTokenSource.java",
+      "android/java/src/org/chromium/blimp/app/auth/TokenSource.java",
+      "android/java/src/org/chromium/blimp/app/auth/TokenSourceImpl.java",
+      "android/java/src/org/chromium/blimp/app/BlimpApplication.java",
+      "android/java/src/org/chromium/blimp/app/BlimpContentsDisplay.java",
+      "android/java/src/org/chromium/blimp/app/BlimpLibraryLoader.java",
+      "android/java/src/org/chromium/blimp/app/BlimpRendererActivity.java",
+      "android/java/src/org/chromium/blimp/app/BrowserRestartActivity.java",
+      "android/java/src/org/chromium/blimp/app/preferences/PreferencesUtil.java",
+      "android/java/src/org/chromium/blimp/app/session/BlimpClientSession.java",
+      "android/java/src/org/chromium/blimp/app/session/EngineInfo.java",
+      "android/java/src/org/chromium/blimp/app/session/TabControlFeature.java",
+      "android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java",
+      "android/java/src/org/chromium/blimp/app/settings/Preferences.java",
+      "android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java",
+      "android/java/src/org/chromium/blimp/app/toolbar/ToolbarMenu.java",
+      "android/java/src/org/chromium/blimp/app/toolbar/UrlBar.java",
     ]
   }
 
   android_library("blimp_test_java") {
     visibility = [ ":*" ]
 
     testonly = true
 
     deps = [
       ":blimp_java",
       "//base:base_java",
       "//base:base_java_test_support",
       "//blimp/client/core/common:common_java",
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/core/settings:settings_java",
       "//blimp/client/public:public_headers_java",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//ui/android:ui_java",
       google_play_services_library,
     ]
 
     java_files = [
-      "android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
-      "android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
+      "android/javatests/src/org/chromium/blimp/app/auth/MockTokenSource.java",
+      "android/javatests/src/org/chromium/blimp/app/auth/RetryingTokenSourceTest.java",
+      "android/javatests/src/org/chromium/blimp/app/BlimpNativeInstrumentationTestCase.java",
       "android/javatests/src/org/chromium/blimp/core/MockBlimpClientContext.java",
       "android/javatests/src/org/chromium/blimp/core/MockBlimpClientContextDelegate.java",
       "android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java",
       "android/javatests/src/org/chromium/blimp/core/settings/MockPreferences.java",
-      "android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java",
     ]
   }
 
   shared_library("blimp_app_android") {
     deps = [
       ":app",
       ":jni_headers",
       "//base",
       "//blimp/client/core",
       "//blimp/client/core/compositor",
@@ skipping 11 matching lines @@
       "//ui/gfx/geometry",
       "//ui/gl",
       "//url:url",
     ]
 
     sources = [
       "android/blimp_app_jni_registrar.cc",
       "android/blimp_app_jni_registrar.h",
       "android/blimp_client_session_android.cc",
       "android/blimp_client_session_android.h",
+      "android/blimp_contents_display.cc",
+      "android/blimp_contents_display.h",
       "android/blimp_library_loader.cc",
       "android/blimp_library_loader.h",
-      "android/blimp_view.cc",
-      "android/blimp_view.h",
       "android/tab_control_feature_android.cc",
       "android/tab_control_feature_android.h",
       "android/toolbar.cc",
       "android/toolbar.h",
     ]
 
     libs = [ "android" ]
   }
 
   android_apk("blimp_apk") {
@@ skipping 13 matching lines @@
   instrumentation_test_apk("blimp_test_apk") {
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     android_manifest_dep = ":blimp_test_apk_manifest"
     deps = [
       ":blimp_test_java",
     ]
   }
 }