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

Unified Diff: chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed redundant #ifdef OS_CHROMEOS guard Created 8 years, 4 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/webui/sync_setup_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index ae1b4be2b01b34432ad75ff5597524b43b7b8d07..662614c9caf1f0455683762b96bf6db1affd133b 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -341,12 +341,12 @@ class TestingSyncSetupHandler : public SyncSetupHandler {
class SigninManagerMock : public FakeSigninManager {
public:
- SigninManagerMock() {}
+ explicit SigninManagerMock(Profile* profile) : FakeSigninManager(profile) {}
MOCK_CONST_METHOD1(IsAllowedUsername, bool(const std::string& username));
};
static ProfileKeyedService* BuildSigninManagerMock(Profile* profile) {
- return new SigninManagerMock();
+ return new SigninManagerMock(profile);
}
// The boolean parameter indicates whether the test is run with ClientOAuth
@@ -367,7 +367,6 @@ class SyncSetupHandlerTest : public testing::TestWithParam<bool> {
error_ = GoogleServiceAuthError::None();
profile_.reset(ProfileSyncServiceMock::MakeSignedInTestingProfile());
- SyncPromoUI::RegisterUserPrefs(profile_->GetPrefs());
mock_pss_ = static_cast<ProfileSyncServiceMock*>(
ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile_.get(),

Powered by Google App Engine
This is Rietveld 408576698