Pull in vr_shell code for webvr

chrome/android/BUILD.gn

 # Copyright 2014 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("//android_webview/webview_repack_locales_list.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
@@ skipping 228 matching lines @@
       "//components/precache/android:precache_java",
       "//components/safe_json/android:safe_json_java",
       "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//components/url_formatter/android:url_formatter_java",
       "//components/web_contents_delegate_android:web_contents_delegate_android_java",
       "//ui/base/mojo:mojo_bindings_java",
     ]
   }
 
-  # VrActivity currently depends on ChromeTabbedActivity which is part of
-  # android_java_ui.
-  if (enable_vr_shell && android_java_ui) {
+  if ((enable_vr_shell || enable_webvr) && android_java_ui) {

[agrieve, 2016/10/05 19:04:58]

nit: remove android_java_ui (here and in the other files you're touching)

[bshe, 2016/10/05 19:53:06]

Done.

     java_files += chrome_vr_java_sources
     deps += [
       "//third_party/gvr-android-sdk:gvr_base_java",
       "//third_party/gvr-android-sdk:gvr_common_java",
     ]
   }
 }
 
 action("chrome_android_java_google_api_keys_srcjar") {
   script = "//build/android/gyp/java_google_api_keys.py"
@@ skipping 468 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }