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

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: Rollback unnecessary changes. 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
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 2ac78f3592ad2db7aec9d437f66dfe09abe54753..97401ff240dfc5c61819f7a4090d0a8a91829a95 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
@@ -1027,6 +1028,16 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
// Change the other pref. SBS should stop now.
pref_service2->SetBoolean(prefs::kSafeBrowsingEnabled, false);
WaitForIOThread();
+#if defined(OS_CHROMEOS)
+ // On Chrome OS we should disable safe browsing for signin profile.
mattm 2015/02/17 23:13:06 Comment seemed a little confusing. Is "On Chrome O
Ivan Podogov 2015/02/18 09:03:30 Signin profile loads first thing during boot-up an
Nikita (slow) 2015/02/19 14:48:09 To clarify what Ivan said, signin profile is in fa
mattm 2015/02/24 20:39:06 Okay, I verified that is the case and filed https:
Ivan Podogov 2015/02/25 11:11:03 Done.
+ 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());

Powered by Google App Engine
This is Rietveld 408576698