Enable enable_resource_whitelist_generation for android-marshmallow-arm64-rel

So that it will be tested by monochrome_apk_checker.

Removes some unittests from Android that were relying on pak entries
that the whitelist removes (not used on Android). Some adjacent unittests
also removed because they also seem to be desktop-specific (see previous
patchset bot results for which tests actually failed).

Bug: 960881, 961270
Change-Id: I00f571ac9bbffa1a90c8f6414b007b3ad9b4b478
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1600421Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659668}

chrome/browser/ui/BUILD.gn

@@ -94,14 +94,6 @@ jumbo_split_static_library("ui") {
     "blocked_content/tab_under_navigation_throttle.h",
     "blocked_content/url_list_manager.cc",
     "blocked_content/url_list_manager.h",
-    "bookmarks/bookmark_bar.h",
-    "bookmarks/bookmark_bubble_observer.h",
-    "bookmarks/bookmark_editor.cc",
-    "bookmarks/bookmark_editor.h",
-    "bookmarks/bookmark_utils.cc",
-    "bookmarks/bookmark_utils.h",
-    "bookmarks/recently_used_folders_combo_model.cc",
-    "bookmarks/recently_used_folders_combo_model.h",
     "browser_dialogs.cc",
     "browser_dialogs.h",
     "browser_navigator_params.cc",
@@ -188,9 +180,6 @@ jumbo_split_static_library("ui") {
     "startup/bad_flags_prompt.cc",
     "startup/bad_flags_prompt.h",
     "status_bubble.h",
-    "sync/bubble_sync_promo_delegate.h",
-    "sync/profile_signin_confirmation_helper.cc",
-    "sync/profile_signin_confirmation_helper.h",
     "sync/tab_contents_synced_tab_delegate.cc",
     "sync/tab_contents_synced_tab_delegate.h",
     "tab_contents/chrome_web_contents_view_delegate.h",
@@ -800,17 +789,25 @@ jumbo_split_static_library("ui") {
       "bluetooth/bluetooth_scanning_prompt_desktop.h",
       "bluetooth/chrome_extension_bluetooth_chooser.cc",
       "bluetooth/chrome_extension_bluetooth_chooser.h",
+      "bookmarks/bookmark_bar.h",
+      "bookmarks/bookmark_bubble_observer.h",
       "bookmarks/bookmark_context_menu_controller.cc",
       "bookmarks/bookmark_context_menu_controller.h",
       "bookmarks/bookmark_drag_drop.cc",
       "bookmarks/bookmark_drag_drop.h",
+      "bookmarks/bookmark_editor.cc",
+      "bookmarks/bookmark_editor.h",
       "bookmarks/bookmark_stats.cc",
       "bookmarks/bookmark_stats.h",
       "bookmarks/bookmark_tab_helper.cc",
       "bookmarks/bookmark_tab_helper.h",
       "bookmarks/bookmark_tab_helper_observer.h",
+      "bookmarks/bookmark_utils.cc",
+      "bookmarks/bookmark_utils.h",
       "bookmarks/bookmark_utils_desktop.cc",
       "bookmarks/bookmark_utils_desktop.h",
+      "bookmarks/recently_used_folders_combo_model.cc",
+      "bookmarks/recently_used_folders_combo_model.h",
       "browser.cc",
       "browser.h",
       "browser_command_controller.cc",
@@ -1033,6 +1030,9 @@ jumbo_split_static_library("ui") {
       "sync/browser_synced_window_delegate.h",
       "sync/browser_synced_window_delegates_getter.cc",
       "sync/browser_synced_window_delegates_getter.h",
+      "sync/bubble_sync_promo_delegate.h",
+      "sync/profile_signin_confirmation_helper.cc",
+      "sync/profile_signin_confirmation_helper.h",
       "sync/sync_promo_ui.cc",
       "sync/sync_promo_ui.h",
       "tab_contents/tab_contents_iterator.cc",

chrome/browser/ui/browser.cc

@@ -103,8 +103,6 @@
 #include "chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h"
 #include "chrome/browser/ui/bluetooth/bluetooth_scanning_prompt_controller.h"
 #include "chrome/browser/ui/bluetooth/bluetooth_scanning_prompt_desktop.h"
-#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
-#include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
@@ -223,6 +221,10 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
+#include "chrome/browser/ui/bookmarks/bookmark_utils.h"
+#endif
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
@@ -428,7 +430,9 @@ Browser::Browser(const CreateParams& params)
       live_tab_context_(new BrowserLiveTabContext(this)),
       synced_window_delegate_(new BrowserSyncedWindowDelegate(this)),
       app_controller_(MaybeCreateWebAppController(this)),
+#if !defined(OS_ANDROID)
       bookmark_bar_state_(BookmarkBar::HIDDEN),
+#endif
       command_controller_(new chrome::BrowserCommandController(this)),
       window_has_shown_(false),
       chrome_updater_factory_(this),
@@ -462,11 +466,13 @@ Browser::Browser(const CreateParams& params)
       prefs::kDevToolsAvailability,
       base::BindRepeating(&Browser::OnDevToolsAvailabilityChanged,
                           base::Unretained(this)));
+#if !defined(OS_ANDROID)
   profile_pref_registrar_.Add(
       bookmarks::prefs::kShowBookmarkBar,
       base::BindRepeating(&Browser::UpdateBookmarkBarState,
                           base::Unretained(this),
                           BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE));
+#endif
 
   if (search::IsInstantExtendedAPIEnabled() && is_type_tabbed())
     instant_controller_.reset(new BrowserInstantController(this));
@@ -1923,11 +1929,13 @@ Browser::GetWebContentsModalDialogHost() {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BookmarkTabHelperObserver implementation:
 
+#if !defined(OS_ANDROID)
 void Browser::URLStarredChanged(content::WebContents* web_contents,
                                 bool starred) {
   if (web_contents == tab_strip_model_->GetActiveWebContents())
     window_->SetStarredState(starred);
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ZoomObserver implementation:
@@ -2632,6 +2640,7 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
 }
 
 void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
+#if !defined(OS_ANDROID)
   BookmarkBar::State state =
       ShouldShowBookmarkBar() ? BookmarkBar::SHOW : BookmarkBar::HIDDEN;
 
@@ -2654,9 +2663,11 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {
   window_->BookmarkBarStateChanged(
       should_animate ? BookmarkBar::ANIMATE_STATE_CHANGE
                      : BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
+#endif
 }
 
 bool Browser::ShouldShowBookmarkBar() const {
+#if !defined(OS_ANDROID)
   if (profile_->IsGuestSession())
     return false;
 
@@ -2672,6 +2683,9 @@ bool Browser::ShouldShowBookmarkBar() const {
   BookmarkTabHelper* bookmark_tab_helper =
       BookmarkTabHelper::FromWebContents(web_contents);
   return bookmark_tab_helper && bookmark_tab_helper->ShouldShowBookmarkBar();
+#else
+  return false;
+#endif
 }
 
 bool Browser::ShouldHideUIForFullscreen() const {

chrome/browser/ui/browser.h

@@ -21,8 +21,6 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
-#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
-#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/chrome_bubble_manager.h"
@@ -52,6 +50,8 @@
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 #if !defined(OS_ANDROID)
+#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
+#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
 #include "components/zoom/zoom_observer.h"
 #endif  // !defined(OS_ANDROID)
 
@@ -114,8 +114,8 @@ class AppBrowserController;
 class Browser : public TabStripModelObserver,
                 public content::WebContentsDelegate,
                 public ChromeWebModalDialogManagerDelegate,
-                public BookmarkTabHelperObserver,
 #if !defined(OS_ANDROID)
+                public BookmarkTabHelperObserver,
                 public zoom::ZoomObserver,
 #endif  // !defined(OS_ANDROID)
                 public content::PageNavigator,
@@ -346,8 +346,10 @@ class Browser : public TabStripModelObserver,
   // Returns true if a FindBarController exists for this browser.
   bool HasFindBarController() const;
 
+#if !defined(OS_ANDROID)
   // Returns the state of the bookmark bar.
   BookmarkBar::State bookmark_bar_state() const { return bookmark_bar_state_; }
+#endif
 
   // State Storage and Retrieval for UI ///////////////////////////////////////
 
@@ -784,11 +786,11 @@ class Browser : public TabStripModelObserver,
   web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
       override;
 
+#if !defined(OS_ANDROID)
   // Overridden from BookmarkTabHelperObserver:
   void URLStarredChanged(content::WebContents* web_contents,
                          bool starred) override;
 
-#if !defined(OS_ANDROID)
   // Overridden from ZoomObserver:
   void OnZoomChanged(
       const zoom::ZoomController::ZoomChangedEventData& data) override;
@@ -1087,7 +1089,9 @@ class Browser : public TabStripModelObserver,
   // set of commands are enabled.
   std::unique_ptr<web_app::AppBrowserController> app_controller_;
 
+#if !defined(OS_ANDROID)
   BookmarkBar::State bookmark_bar_state_;
+#endif
 
   std::unique_ptr<ExclusiveAccessManager> exclusive_access_manager_;
 

chrome/test/BUILD.gn

@@ -2977,15 +2977,11 @@ test("unit_tests") {
     "../browser/ui/android/tab_model/tab_model_list_unittest.cc",
     "../browser/ui/android/tab_model/tab_model_unittest.cc",
     "../browser/ui/autofill/autofill_popup_layout_model_unittest.cc",
-    "../browser/ui/autofill/payments/autofill_dialog_models_unittest.cc",
     "../browser/ui/autofill/popup_view_common_unittest.cc",
     "../browser/ui/autofill/popup_view_test_helpers.cc",
     "../browser/ui/autofill/popup_view_test_helpers.h",
     "../browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc",
     "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc",
-    "../browser/ui/bookmarks/bookmark_editor_unittest.cc",
-    "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
-    "../browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc",
     "../browser/ui/chrome_select_file_policy_unittest.cc",
     "../browser/ui/find_bar/find_backend_unittest.cc",
     "../browser/ui/login/login_handler_unittest.cc",
@@ -2996,8 +2992,6 @@ test("unit_tests") {
     "../browser/ui/passwords/settings/password_manager_porter_unittest.cc",
     "../browser/ui/passwords/settings/password_manager_presenter_unittest.cc",
     "../browser/ui/search_engines/keyword_editor_controller_unittest.cc",
-    "../browser/ui/sync/profile_signin_confirmation_helper_unittest.cc",
-    "../browser/ui/sync/sync_promo_ui_unittest.cc",
     "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
     "../browser/ui/webui/favicon_source_unittest.cc",
     "../browser/ui/webui/fileicon_source_unittest.cc",
@@ -3085,11 +3079,17 @@ test("unit_tests") {
   }
 
   if (!is_android) {
-    # CRLSets are not supported on Android or iOS, but available on all other
-    # platforms.
     sources += [
+      # CRLSets are not supported on Android or iOS, but available on all other
+      # platforms.
       "../browser/component_updater/crl_set_component_installer_unittest.cc",
+      "../browser/ui/autofill/payments/autofill_dialog_models_unittest.cc",
+      "../browser/ui/bookmarks/bookmark_editor_unittest.cc",
+      "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
+      "../browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc",
       "../browser/ui/hats/hats_unittest.cc",
+      "../browser/ui/sync/profile_signin_confirmation_helper_unittest.cc",
+      "../browser/ui/sync/sync_promo_ui_unittest.cc",
       "../browser/ui/thumbnails/thumbnail_utils_unittest.cc",
       "../browser/ui/toolbar/app_menu_icon_controller_unittest.cc",
     ]
@@ -4587,13 +4587,6 @@ test("unit_tests") {
       sources += [ "../browser/google/google_update_win_unittest.cc" ]
     }
   }
-  if (is_android) {
-    sources -= [
-      "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
-      "../browser/ui/sync/sync_promo_ui_unittest.cc",
-      "../browser/ui/sync/tab_contents_synced_tab_delegate_unittest.cc",
-    ]
-  }
   if (!is_android && !is_chromeos) {
     sources += [
       "../browser/media/webrtc/native_desktop_media_list_unittest.cc",

tools/mb/mb_config.pyl

@@ -635,7 +635,7 @@
       # shared library loading is fixed.
       'android-cronet-arm-dbg': 'android_cronet_debug_static_bot_arm_no_neon',
       'android-kitkat-arm-rel': 'android_release_trybot',
-      'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_no_symbols',
+      'android-marshmallow-arm64-rel': 'gpu_tests_android_release_trybot_arm64_minimal_symbols',
       'android-oreo-arm64-cts-networkservice-dbg': 'android_debug_trybot_arm64',
       'android_archive_rel_ng': 'android_release_trybot',
       'android_arm64_dbg_recipe': 'android_debug_trybot_compile_only_arm64',
@@ -1519,7 +1519,7 @@
 
     'gpu_tests_android_release_bot_minimal_symbols_arm64': [
       'android', 'release_bot', 'minimal_symbols', 'arm64',
-      'strip_debug_info', 'static_angle',
+      'resource_whitelisting', 'static_angle',
     ],
 
     'gpu_tests_android_release_trybot': [
@@ -1530,8 +1530,9 @@
       'gpu_tests', 'android', 'release_trybot', 'arm64', 'static_angle',
     ],
 
-    'gpu_tests_android_release_trybot_arm64_no_symbols': [
-      'android', 'release_trybot', 'arm64', 'no_symbols', 'static_angle',
+    'gpu_tests_android_release_trybot_arm64_minimal_symbols': [
+      'android', 'release_trybot', 'arm64', 'minimal_symbols', 'static_angle',
+      'resource_whitelisting',
     ],
 
     'gpu_tests_android_vulkan_release_trybot': [