Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Issue 933503004: Always load signin profile on Chrome OS startup. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final nits. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index f5983269fdd2789b5fa01cf74e3dc2609835859e..a9cb01607343ae623ccd711e68c6f7bd01fb3551 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -48,6 +48,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chromeos/chromeos_switches.h"
#endif
@@ -1028,6 +1029,18 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
// Change the other pref. SBS should stop now.
pref_service2->SetBoolean(prefs::kSafeBrowsingEnabled, false);
WaitForIOThread();
+
+// TODO(mattm): Remove this when crbug.com/461493 is fixed.
+#if defined(OS_CHROMEOS)
+ // On Chrome OS we should disable safe browsing for signin profile.
+ EXPECT_TRUE(sb_service->enabled());
+ EXPECT_TRUE(csd_service->enabled());
+ chromeos::ProfileHelper::GetSigninProfile()
+ ->GetOriginalProfile()
+ ->GetPrefs()
+ ->SetBoolean(prefs::kSafeBrowsingEnabled, false);
+ WaitForIOThread();
+#endif
EXPECT_FALSE(sb_service->enabled());
EXPECT_FALSE(csd_service->enabled());
« no previous file with comments | « chrome/browser/profiles/profile_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698