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

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rerererebase Created 6 years, 9 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/ui/sync/one_click_signin_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index 209f8aabb67ad4abfe782fe8e5fbced7c6beceec..8848f84cab43260d0a6f90f2080c9e37a55c2d21 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -36,6 +36,7 @@
#include "chrome/test/base/testing_profile_manager.h"
#include "components/autofill/core/common/password_form.h"
#include "components/signin/core/profile_oauth2_token_service.h"
+#include "components/sync_driver/pref_names.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/web_contents.h"
@@ -83,7 +84,7 @@ class TestProfileIOData : public ProfileIOData {
google_services_username_pattern()->Init(
prefs::kGoogleServicesUsernamePattern, local_state);
- sync_disabled()->Init(prefs::kSyncManaged, pref_service);
+ sync_disabled()->Init(sync_driver::prefs::kSyncManaged, pref_service);
signin_allowed()->Init(prefs::kSigninAllowed, pref_service);
@@ -639,7 +640,7 @@ TEST_F(OneClickSigninHelperTest, CanOfferDisabledByPolicy) {
// Simulate a policy disabling sync by writing kSyncManaged directly.
profile()->GetTestingPrefService()->SetManagedPref(
- prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
+ sync_driver::prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
// Should still offer even if sync is disabled by policy.
EXPECT_TRUE(OneClickSigninHelper::CanOffer(
@@ -859,7 +860,7 @@ TEST_F(OneClickSigninHelperIOTest, CanOfferOnIOThreadDisabledByPolicy) {
// Simulate a policy disabling sync by writing kSyncManaged directly.
// We should still offer to sign in the browser.
profile()->GetTestingPrefService()->SetManagedPref(
- prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
+ sync_driver::prefs::kSyncManaged, base::Value::CreateBooleanValue(true));
EXPECT_EQ(OneClickSigninHelper::CAN_OFFER,
OneClickSigninHelper::CanOfferOnIOThreadImpl(
valid_gaia_url_, &request_, io_data.get()));
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698