Android: Do not build files not needed on the platform.

This gives us the size decreases from  https://crbug.com/159847#c39

BUG=159847

Review URL: https://codereview.chromium.org/1371863002

Cr-Commit-Position: refs/heads/master@{#351137}

chrome/browser/BUILD.gn

@@ -1104,6 +1104,15 @@ source_set("test_support") {
     ]
   }
 
+  if (is_android) {
+    sources -= [
+      "sessions/session_service_test_helper.cc",
+      "sessions/session_service_test_helper.h",
+      "ui/webui/signin/login_ui_test_utils.cc",
+      "ui/webui/signin/login_ui_test_utils.h",
+    ]
+  }
+
   if (enable_extensions) {
     sources += [
       "extensions/extension_action_test_util.cc",

chrome/browser/prefs/browser_prefs.cc

@@ -62,14 +62,12 @@
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
-#include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -147,6 +145,7 @@
 #else
 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
+#include "chrome/browser/upgrade_detector.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
@@ -221,6 +220,10 @@
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#endif
+
 namespace {
 
 #if !defined(OS_ANDROID)
@@ -237,7 +240,6 @@ const char kLegacyProfileResetPromptMemento[] = "profile.reset_prompt_memento";
 namespace chrome {
 
 void RegisterLocalState(PrefRegistrySimple* registry) {
-
   // Please keep this list alphabetized.
   AppListService::RegisterPrefs(registry);
   browser_shutdown::RegisterPrefs(registry);
@@ -262,7 +264,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   RegisterScreenshotPrefs(registry);
   SigninManagerFactory::RegisterPrefs(registry);
   SSLConfigServiceManager::RegisterPrefs(registry);
-  UpgradeDetector::RegisterPrefs(registry);
   web_resource::PromoResourceService::RegisterPrefs(registry);
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
@@ -298,6 +299,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   StartupBrowserCreator::RegisterLocalStatePrefs(registry);
   // The native GCM is used on Android instead.
   gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
+  UpgradeDetector::RegisterPrefs(registry);
 #if !defined(OS_CHROMEOS)
   RegisterDefaultBrowserPromptPrefs(registry);
 #endif  // !defined(OS_CHROMEOS)

chrome/browser/ui/BUILD.gn

@@ -182,9 +182,6 @@ source_set("ui") {
                            "//chrome")
     deps += [ "//chrome/browser/chromeos" ]
   } else {
-    sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources,
-                           ".",
-                           "//chrome")
     defines += [ "FRAME_AVATAR_BUTTON=1" ]
   }
   if (use_cups) {
@@ -526,6 +523,16 @@ source_set("test_support") {
     }
   }
 
+  if (is_android) {
+    sources -= [
+      "exclusive_access/fullscreen_controller_state_test.cc",
+      "exclusive_access/fullscreen_controller_state_test.h",
+      "exclusive_access/fullscreen_controller_state_tests.h",
+      "exclusive_access/fullscreen_controller_test.cc",
+      "exclusive_access/fullscreen_controller_test.h",
+    ]
+  }
+
   public_deps = [
     ":ui",
   ]

chrome/browser/ui/tab_helpers.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
-#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
@@ -60,6 +59,7 @@
 #include "chrome/browser/plugins/plugin_observer.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h"
+#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
 #include "chrome/browser/ui/sad_tab_helper.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
@@ -143,7 +143,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
       autofill::ChromeAutofillClient::FromWebContents(web_contents),
       g_browser_process->GetApplicationLocale(),
       autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
-  BookmarkTabHelper::CreateForWebContents(web_contents);
   chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
   chrome_browser_net::PredictorTabHelper::CreateForWebContents(web_contents);
   ChromeContentSettingsClient::CreateForWebContents(web_contents);
@@ -185,6 +184,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   VoiceSearchTabHelper::CreateForWebContents(web_contents);
   WindowAndroidHelper::CreateForWebContents(web_contents);
 #else
+  BookmarkTabHelper::CreateForWebContents(web_contents);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents);
   extensions::WebNavigationTabObserver::CreateForWebContents(web_contents);

chrome/chrome_browser.gypi

@@ -858,8 +858,6 @@
       'browser/translate/translate_service.h',
       'browser/update_client/chrome_update_query_params_delegate.cc',
       'browser/update_client/chrome_update_query_params_delegate.h',
-      'browser/upgrade_detector.cc',
-      'browser/upgrade_detector.h',
       'browser/web_data_service_factory.cc',
       'browser/web_data_service_factory.h',
     ],
@@ -1273,6 +1271,8 @@
       'browser/sync/sync_ui_util.h',
       'browser/tracing/chrome_tracing_delegate.cc',
       'browser/tracing/chrome_tracing_delegate.h',
+      'browser/upgrade_detector.cc',
+      'browser/upgrade_detector.h',
       'browser/usb/web_usb_permission_provider.cc',
       'browser/usb/web_usb_permission_provider.h',
     ],

chrome/chrome_browser_ui.gypi

@@ -116,8 +116,6 @@
       'browser/ui/autofill/password_generation_popup_view.h',
       'browser/ui/autofill/popup_controller_common.cc',
       'browser/ui/autofill/popup_controller_common.h',
-      'browser/ui/blocked_content/app_modal_dialog_helper.cc',
-      'browser/ui/blocked_content/app_modal_dialog_helper.h',
       'browser/ui/blocked_content/blocked_window_params.cc',
       'browser/ui/blocked_content/blocked_window_params.h',
       'browser/ui/blocked_content/popup_blocker_tab_helper.cc',
@@ -129,8 +127,6 @@
       'browser/ui/bookmarks/bookmark_bubble_observer.h',
       'browser/ui/bookmarks/bookmark_editor.cc',
       'browser/ui/bookmarks/bookmark_editor.h',
-      'browser/ui/bookmarks/bookmark_tab_helper.cc',
-      'browser/ui/bookmarks/bookmark_tab_helper.h',
       'browser/ui/bookmarks/bookmark_utils.cc',
       'browser/ui/bookmarks/bookmark_utils.h',
       'browser/ui/bookmarks/recently_used_folders_combo_model.cc',
@@ -231,17 +227,10 @@
       'browser/ui/search_engines/search_engine_tab_helper.h',
       'browser/ui/search_engines/template_url_table_model.cc',
       'browser/ui/search_engines/template_url_table_model.h',
-      'browser/ui/settings_window_manager.cc',
-      'browser/ui/settings_window_manager.h',
-      'browser/ui/settings_window_manager_observer.h',
       'browser/ui/simple_message_box.h',
       'browser/ui/simple_message_box_internal.cc',
       'browser/ui/simple_message_box_internal.h',
       'browser/ui/status_bubble.h',
-      'browser/ui/sync/browser_synced_window_delegates_getter.cc',
-      'browser/ui/sync/browser_synced_window_delegates_getter.h',
-      'browser/ui/sync/inline_login_dialog.cc',
-      'browser/ui/sync/inline_login_dialog.h',
       'browser/ui/sync/profile_signin_confirmation_helper.cc',
       'browser/ui/sync/profile_signin_confirmation_helper.h',
       'browser/ui/sync/tab_contents_synced_tab_delegate.cc',
@@ -258,16 +247,12 @@
       'browser/ui/tab_modal_confirm_dialog.h',
       'browser/ui/translate/language_combobox_model.cc',
       'browser/ui/translate/language_combobox_model.h',
-      'browser/ui/translate/translate_bubble_factory.cc',
-      'browser/ui/translate/translate_bubble_factory.h',
       'browser/ui/translate/translate_bubble_model.h',
       'browser/ui/translate/translate_bubble_model_impl.cc',
       'browser/ui/translate/translate_bubble_model_impl.h',
       'browser/ui/translate/translate_bubble_view_state_transition.cc',
       'browser/ui/translate/translate_bubble_view_state_transition.h',
       'browser/ui/uninstall_browser_prompt.h',
-      'browser/ui/user_manager.cc',
-      'browser/ui/user_manager.h',
       'browser/ui/validation_message_bubble.h',
       'browser/ui/view_ids.h',
       'browser/ui/views/platform_keys_certificate_selector_chromeos.cc',
@@ -408,8 +393,6 @@
       'browser/ui/webui/chromeos/ui_account_tweaks.h',
       'browser/ui/webui/components_ui.cc',
       'browser/ui/webui/components_ui.h',
-      'browser/ui/webui/constrained_web_dialog_delegate_base.cc',
-      'browser/ui/webui/constrained_web_dialog_delegate_base.h',
       'browser/ui/webui/constrained_web_dialog_ui.cc',
       'browser/ui/webui/constrained_web_dialog_ui.h',
       'browser/ui/webui/cookies_tree_model_util.cc',
@@ -728,12 +711,6 @@
       'browser/ui/webui/chromeos/emulator/device_emulator_ui.cc',
       'browser/ui/webui/chromeos/emulator/device_emulator_ui.h',
     ],
-    # Used everywhere but ChromeOS.
-    'chrome_browser_ui_non_chromeos_sources': [
-      'browser/ui/external_protocol_dialog_delegate.cc',
-      'browser/ui/external_protocol_dialog_delegate.h',
-      'browser/ui/startup/default_browser_prompt.cc',
-    ],
     # Mac sources, except when mac_views_browser==1
     'chrome_browser_ui_cocoa_sources': [
       'browser/ui/cocoa/animatable_image.h',
@@ -1298,6 +1275,9 @@
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
+      'browser/ui/startup/default_browser_prompt.cc',
+      'browser/ui/startup/default_browser_prompt.h',
+      'browser/ui/startup/default_browser_prompt_win.cc',
       'browser/ui/sync/one_click_signin_bubble_delegate.h',
       'browser/ui/sync/one_click_signin_bubble_links_delegate.cc',
       'browser/ui/sync/one_click_signin_bubble_links_delegate.h',
@@ -1495,12 +1475,16 @@
       'browser/ui/autofill/new_credit_card_bubble_controller.h',
       'browser/ui/autofill/new_credit_card_bubble_view.cc',
       'browser/ui/autofill/new_credit_card_bubble_view.h',
+      'browser/ui/blocked_content/app_modal_dialog_helper.cc',
+      'browser/ui/blocked_content/app_modal_dialog_helper.h',
       'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.cc',
       'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h',
       'browser/ui/bookmarks/bookmark_context_menu_controller.cc',
       'browser/ui/bookmarks/bookmark_context_menu_controller.h',
       'browser/ui/bookmarks/bookmark_drag_drop.cc',
       'browser/ui/bookmarks/bookmark_drag_drop.h',
+      'browser/ui/bookmarks/bookmark_tab_helper.cc',
+      'browser/ui/bookmarks/bookmark_tab_helper.h',
       'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc',
       'browser/ui/bookmarks/bookmark_tab_helper_delegate.h',
       'browser/ui/bookmarks/enhanced_bookmark_key_service.cc',
@@ -1651,14 +1635,15 @@
       'browser/ui/search/search_ui.h',
       'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
       'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
+      'browser/ui/settings_window_manager.cc',
+      'browser/ui/settings_window_manager.h',
+      'browser/ui/settings_window_manager_observer.h',
       'browser/ui/singleton_tabs.cc',
       'browser/ui/singleton_tabs.h',
       'browser/ui/startup/autolaunch_prompt.h',
       'browser/ui/startup/autolaunch_prompt_win.cc',
       'browser/ui/startup/bad_flags_prompt.cc',
       'browser/ui/startup/bad_flags_prompt.h',
-      'browser/ui/startup/default_browser_prompt.h',
-      'browser/ui/startup/default_browser_prompt_win.cc',
       'browser/ui/startup/google_api_keys_infobar_delegate.cc',
       'browser/ui/startup/google_api_keys_infobar_delegate.h',
       'browser/ui/startup/obsolete_system_infobar_delegate.cc',
@@ -1674,6 +1659,10 @@
       'browser/ui/startup/startup_types.h',
       'browser/ui/sync/browser_synced_window_delegate.cc',
       'browser/ui/sync/browser_synced_window_delegate.h',
+      'browser/ui/sync/browser_synced_window_delegates_getter.cc',
+      'browser/ui/sync/browser_synced_window_delegates_getter.h',
+      'browser/ui/sync/inline_login_dialog.cc',
+      'browser/ui/sync/inline_login_dialog.h',
       'browser/ui/sync/sync_promo_ui.cc',
       'browser/ui/sync/sync_promo_ui.h',
       'browser/ui/tab_contents/tab_contents_iterator.cc',
@@ -1731,10 +1720,14 @@
       'browser/ui/toolbar/wrench_menu_badge_controller.h',
       'browser/ui/toolbar/wrench_menu_model.cc',
       'browser/ui/toolbar/wrench_menu_model.h',
+      'browser/ui/translate/translate_bubble_factory.cc',
+      'browser/ui/translate/translate_bubble_factory.h',
       'browser/ui/uma_browsing_activity_observer.cc',
       'browser/ui/uma_browsing_activity_observer.h',
       'browser/ui/unload_controller.cc',
       'browser/ui/unload_controller.h',
+      'browser/ui/user_manager.cc',
+      'browser/ui/user_manager.h',
       'browser/ui/website_settings/permission_menu_model.cc',
       'browser/ui/website_settings/permission_menu_model.h',
       'browser/ui/website_settings/website_settings_infobar_delegate.cc',
@@ -1747,6 +1740,8 @@
       'browser/ui/webui/bookmarks_ui.h',
       'browser/ui/webui/chrome_web_contents_handler.cc',
       'browser/ui/webui/chrome_web_contents_handler.h',
+      'browser/ui/webui/constrained_web_dialog_delegate_base.cc',
+      'browser/ui/webui/constrained_web_dialog_delegate_base.h',
       'browser/ui/webui/copresence_ui.cc',
       'browser/ui/webui/copresence_ui.h',
       'browser/ui/webui/copresence_ui_handler.cc',
@@ -2024,6 +2019,8 @@
     ],
     # Views files for everywhere but ChromeOS.
     'chrome_browser_ui_views_non_chromeos_sources': [
+      'browser/ui/external_protocol_dialog_delegate.cc',
+      'browser/ui/external_protocol_dialog_delegate.h',
       'browser/ui/views/external_protocol_dialog.cc',
       'browser/ui/views/external_protocol_dialog.h',
       'browser/ui/views/frame/opaque_browser_frame_view.cc',
@@ -2833,7 +2830,6 @@
           ],
           'sources!': [
             'browser/ui/external_protocol_dialog_delegate.cc',
-            'browser/ui/startup/default_browser_prompt.cc',
           ],
           'dependencies': [
             '../net/net.gyp:net',
@@ -2887,8 +2883,6 @@
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
           ],
-        }, {
-          'sources': [ '<@(chrome_browser_ui_non_chromeos_sources)' ],
         }],
         ['use_cups==1', {
           'dependencies': [

chrome/chrome_tests_unit.gypi

@@ -202,8 +202,6 @@
       'browser/resources_util_unittest.cc',
       'browser/search/contextual_search_policy_handler_android_unittest.cc',
       'browser/search/iframe_source_unittest.cc',
-      'browser/search/instant_unittest_base.cc',
-      'browser/search/instant_unittest_base.h',
       'browser/search/thumbnail_source_unittest.cc',
       'browser/search_engines/search_provider_install_data_unittest.cc',
       'browser/service_process/service_process_control_mac_unittest.mm',
@@ -1506,6 +1504,8 @@
       'browser/profile_resetter/triggered_profile_resetter_win_unittest.cc',
       'browser/renderer_context_menu/render_view_context_menu_unittest.cc',
       'browser/search/instant_service_unittest.cc',
+      'browser/search/instant_unittest_base.cc',
+      'browser/search/instant_unittest_base.h',
       'browser/search/search_unittest.cc',
       # GCMDriverAndroid is not yet implemented.
       'browser/services/gcm/gcm_profile_service_unittest.cc',
@@ -1892,6 +1892,25 @@
             ['include', '^test/base/testing_browser_process'],
           ],
         }],
+        ['OS=="android"', {
+          'sources!': [
+            'browser/sessions/session_service_test_helper.cc',
+            'browser/sessions/session_service_test_helper.h',
+            'browser/ui/exclusive_access/fullscreen_controller_state_test.cc',
+            'browser/ui/exclusive_access/fullscreen_controller_state_test.h',
+            'browser/ui/exclusive_access/fullscreen_controller_state_tests.h',
+            'browser/ui/exclusive_access/fullscreen_controller_test.cc',
+            'browser/ui/exclusive_access/fullscreen_controller_test.h',
+            'browser/ui/webui/signin/login_ui_test_utils.cc',
+            'browser/ui/webui/signin/login_ui_test_utils.h',
+            'test/base/dialog_test_browser_window.cc',
+            'test/base/dialog_test_browser_window.h',
+            'test/base/in_process_browser_test.cc',
+            'test/base/in_process_browser_test.h',
+            'test/base/test_browser_window.cc',
+            'test/base/test_browser_window.h',
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',

chrome/test/BUILD.gn

@@ -163,6 +163,17 @@ source_set("test_support") {
     ]
   }
 
+  if (is_android) {
+    sources -= [
+      "base/dialog_test_browser_window.cc",
+      "base/dialog_test_browser_window.h",
+      "base/in_process_browser_test.cc",
+      "base/in_process_browser_test.h",
+      "base/test_browser_window.cc",
+      "base/test_browser_window.h",
+    ]
+  }
+
   if (enable_extensions) {
     deps += [
       "//chrome/common/extensions/api",
@@ -659,7 +670,9 @@ if (!is_android) {
   # The _run targets exist only for compatibility w/ GYP.
   group("browser_tests_run") {
     testonly = true
-    data_deps = [ ":browser_tests" ]
+    data_deps = [
+      ":browser_tests",
+    ]
   }
 
   test("browser_tests") {
@@ -1208,7 +1221,9 @@ if (!is_android) {
       "//third_party/WebKit/public:blink",
     ]
 
-    data_deps = [ "//third_party/mesa:osmesa" ]
+    data_deps = [
+      "//third_party/mesa:osmesa",
+    ]
 
     if (cld_version == 2) {
       # Language detection is irrelevant to sync, so it can depend on any