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

Unified Diff: chrome/browser/sync/startup_controller_unittest.cc

Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/sync/startup_controller_unittest.cc
diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc
index 42ef53077a558c2b528b777cdb7f78ede59f88cf..63a22cf0af7c76913894f31b7b19e7e5d737512c 100644
--- a/chrome/browser/sync/startup_controller_unittest.cc
+++ b/chrome/browser/sync/startup_controller_unittest.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
#include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_profile.h"
#include "components/sync_driver/sync_prefs.h"
@@ -31,11 +31,11 @@ static const char kStateStringStarted[] = "Started";
static const char kStateStringDeferred[] = "Deferred";
static const char kStateStringNotStarted[] = "Not started";
-class FakeManagedUserSigninManagerWrapper
- : public ManagedUserSigninManagerWrapper {
+class FakeSupervisedUserSigninManagerWrapper
+ : public SupervisedUserSigninManagerWrapper {
public:
- FakeManagedUserSigninManagerWrapper()
- : ManagedUserSigninManagerWrapper(NULL, NULL) {}
+ FakeSupervisedUserSigninManagerWrapper()
+ : SupervisedUserSigninManagerWrapper(NULL, NULL) {}
virtual std::string GetEffectiveUsername() const OVERRIDE {
return account_;
}
@@ -59,7 +59,7 @@ class StartupControllerTest : public testing::Test {
sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
token_service_.reset(static_cast<FakeProfileOAuth2TokenService*>(
BuildFakeProfileOAuth2TokenService(profile_.get())));
- signin_.reset(new FakeManagedUserSigninManagerWrapper());
+ signin_.reset(new FakeSupervisedUserSigninManagerWrapper());
ProfileSyncServiceStartBehavior behavior =
browser_defaults::kSyncAutoStarts ? AUTO_START : MANUAL_START;
@@ -89,7 +89,7 @@ class StartupControllerTest : public testing::Test {
bool started() const { return started_; }
void clear_started() { started_ = false; }
StartupController* controller() { return controller_.get(); }
- FakeManagedUserSigninManagerWrapper* signin() { return signin_.get(); }
+ FakeSupervisedUserSigninManagerWrapper* signin() { return signin_.get(); }
FakeProfileOAuth2TokenService* token_service() {
return token_service_.get();
}
@@ -100,7 +100,7 @@ class StartupControllerTest : public testing::Test {
bool started_;
base::MessageLoop message_loop_;
scoped_ptr<StartupController> controller_;
- scoped_ptr<FakeManagedUserSigninManagerWrapper> signin_;
+ scoped_ptr<FakeSupervisedUserSigninManagerWrapper> signin_;
scoped_ptr<FakeProfileOAuth2TokenService> token_service_;
scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
scoped_ptr<TestingProfile> profile_;
« no previous file with comments | « chrome/browser/sync/startup_controller.cc ('k') | chrome/browser/sync/supervised_user_signin_manager_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698