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

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

Issue 240333011: Always load signin profile on Chrome OS startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Next iteration. Created 6 years, 7 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 5ba5da999320eff17c052e0401baaa26e76b24a1..f2c489dcc29b6345ca7d6c2f31634b0f3a4be2d9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -44,6 +44,10 @@
#include "sql/statement.h"
#include "testing/gmock/include/gmock/gmock.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#endif
+
using content::BrowserThread;
using content::InterstitialPage;
using content::WebContents;
@@ -765,6 +769,14 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
// Change the other pref. SBS should stop now.
pref_service2->SetBoolean(prefs::kSafeBrowsingEnabled, false);
WaitForIOThread();
+#if defined(CHROME_OS)
+ // 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.cc ('k') | chrome/test/data/extensions/api_test/file_browser/mount_test/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698