Fix unit_tests in notouch mode

Some tests have incorrect expectations given the features
enabled in this mode. The safe browsing tests were failing
due to using the v4 database which required pumping messages
on the IO thread to complete initialization.

Bug: 974405
Change-Id: I238ab3b9d4f87603c3c79a45ab2c2492dee27fa3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674044
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672544}

chrome/browser/download/chrome_download_manager_delegate_unittest.cc

@@ -58,6 +58,7 @@
 #endif
 
 #if defined(OS_ANDROID)
+#include "chrome/browser/android/feature_utilities.h"
 #include "chrome/browser/download/download_prompt_status.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/infobars/core/infobar.h"
@@ -1570,6 +1571,11 @@ TEST_F(ChromeDownloadManagerDelegateTest, RequestConfirmation_Android) {
 
 TEST_F(ChromeDownloadManagerDelegateTest,
        RequestConfirmation_Android_WithLocationChangeEnabled) {
+#if defined(OS_ANDROID)
+  // We do not prompt for location in this case.
+  if (chrome::android::IsNoTouchModeEnabled())
+    return;
+#endif
   DeleteContents();
   SetContents(CreateTestWebContents());
 

chrome/browser/prefs/incognito_mode_prefs.cc

@@ -123,14 +123,10 @@ class PlatformParentalControlsValue {
 }  // namespace
 #endif  // OS_WIN
 
-namespace {
-static constexpr IncognitoModePrefs::Availability kDefaultAvailability =
-#if defined(INCOGNITO_DEFAULT_DISABLED)
-    IncognitoModePrefs::DISABLED;
-#else
-    IncognitoModePrefs::ENABLED;
-#endif
-}  // namespace
+// static
+// Sadly, this is required until c++17.
+constexpr IncognitoModePrefs::Availability
+    IncognitoModePrefs::kDefaultAvailability;
 
 // static
 bool IncognitoModePrefs::IntToAvailability(int in_value,

chrome/browser/prefs/incognito_mode_prefs.h

@@ -39,6 +39,13 @@ class IncognitoModePrefs {
     AVAILABILITY_NUM_TYPES
   };
 
+  static constexpr Availability kDefaultAvailability =
+#if defined(INCOGNITO_DEFAULT_DISABLED)
+      DISABLED;
+#else
+      ENABLED;
+#endif
+
   // Register incognito related preferences.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 

chrome/browser/prefs/incognito_mode_prefs_unittest.cc

@@ -32,9 +32,9 @@ TEST_F(IncognitoModePrefsTest, IntToAvailability) {
   EXPECT_EQ(IncognitoModePrefs::FORCED, incognito);
 
   EXPECT_FALSE(IncognitoModePrefs::IntToAvailability(10, &incognito));
-  EXPECT_EQ(IncognitoModePrefs::ENABLED, incognito);
+  EXPECT_EQ(IncognitoModePrefs::kDefaultAvailability, incognito);
   EXPECT_FALSE(IncognitoModePrefs::IntToAvailability(-1, &incognito));
-  EXPECT_EQ(IncognitoModePrefs::ENABLED, incognito);
+  EXPECT_EQ(IncognitoModePrefs::kDefaultAvailability, incognito);
 }
 
 TEST_F(IncognitoModePrefsTest, GetAvailability) {

chrome/browser/profiles/profile_manager_unittest.cc

@@ -900,7 +900,7 @@ TEST_F(ProfileManagerTest, GetLastUsedProfileAllowedByPolicy) {
   ASSERT_TRUE(profile);
   EXPECT_FALSE(profile->IsOffTheRecord());
   PrefService* prefs = profile->GetPrefs();
-  EXPECT_EQ(IncognitoModePrefs::ENABLED,
+  EXPECT_EQ(IncognitoModePrefs::kDefaultAvailability,
             IncognitoModePrefs::GetAvailability(prefs));
 
   ASSERT_TRUE(profile->GetOffTheRecordProfile());

chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

@@ -303,6 +303,8 @@ class SafeBrowsingBlockingPageTestBase
     Profile* profile =
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
     safe_browsing_service->AddPrefService(profile->GetPrefs());
+    content::BrowserThread::RunAllPendingTasksOnThreadForTesting(
+        content::BrowserThread::IO);
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     // EventRouterFactory redirects incognito context to original profile.
     test_event_router_ =
@@ -1111,6 +1113,8 @@ class SafeBrowsingBlockingQuietPageTest
     TestingBrowserProcess::GetGlobal()->SetSafeBrowsingService(
         safe_browsing_service);
     g_browser_process->safe_browsing_service()->Initialize();
+    content::BrowserThread::RunAllPendingTasksOnThreadForTesting(
+        content::BrowserThread::IO);
   }
 
   void TearDown() override {

chrome/browser/safe_browsing/ui_manager_unittest.cc

@@ -99,6 +99,8 @@ class SafeBrowsingUIManagerTest : public ChromeRenderViewHostTestHarness {
     safe_browsing_service->AddPrefService(
         Profile::FromBrowserContext(web_contents()->GetBrowserContext())
             ->GetPrefs());
+    content::BrowserThread::RunAllPendingTasksOnThreadForTesting(
+        content::BrowserThread::IO);
   }
 
   void TearDown() override {

chrome/test/BUILD.gn

@@ -3226,6 +3226,10 @@ test("unit_tests") {
 
   configs += [ "//build/config:precompiled_headers" ]
 
+  if (is_android && notouch_build) {
+    configs += [ "//chrome/browser:notouch_config" ]
+  }
+
   data_deps = [
     "//chrome/test/data/media/engagement/preload:generate_preload_list",
     "//chrome/test/data/media/engagement/preload:test_data",