Rename "managed (mode|user)" to "supervised user" (part 2)

chrome/browser/supervised_user/supervised_user_service_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
similarity index 62%
rename from chrome/browser/managed_mode/managed_user_service_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_service_unittest.cc
index 862bf69c4839219fc93ccf605b90599135d83300..4fdf6d1d9e501528f40a850a6f836ad73e4411b3 100644
--- a/chrome/browser/managed_mode/managed_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -9,14 +9,14 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
-#include "chrome/browser/managed_mode/custodian_profile_downloader_service.h"
-#include "chrome/browser/managed_mode/custodian_profile_downloader_service_factory.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
-#include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #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/supervised_user/custodian_profile_downloader_service.h"
+#include "chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_service.h"
+#include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/features/feature_channel.h"
@@ -37,15 +37,16 @@ void OnProfileDownloadedFail(const base::string16& full_name) {
   ASSERT_TRUE(false) << "Profile download should not have succeeded.";
 }
 
-class ManagedModeURLFilterObserver : public ManagedModeURLFilter::Observer {
+class SupervisedUserURLFilterObserver :
+    public SupervisedUserURLFilter::Observer {
  public:
-  explicit ManagedModeURLFilterObserver(ManagedModeURLFilter* url_filter)
+  explicit SupervisedUserURLFilterObserver(SupervisedUserURLFilter* url_filter)
       : url_filter_(url_filter) {
     Reset();
     url_filter_->AddObserver(this);
   }
 
-  ~ManagedModeURLFilterObserver() {
+  ~SupervisedUserURLFilterObserver() {
     url_filter_->RemoveObserver(this);
   }
 
@@ -54,7 +55,7 @@ class ManagedModeURLFilterObserver : public ManagedModeURLFilter::Observer {
     Reset();
   }
 
-  // ManagedModeURLFilter::Observer
+  // SupervisedUserURLFilter::Observer
   virtual void OnSiteListUpdated() OVERRIDE {
     message_loop_runner_->Quit();
   }
@@ -64,38 +65,38 @@ class ManagedModeURLFilterObserver : public ManagedModeURLFilter::Observer {
     message_loop_runner_ = new MessageLoopRunner;
   }
 
-  ManagedModeURLFilter* url_filter_;
+  SupervisedUserURLFilter* url_filter_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 };
 
-class ManagedUserServiceTest : public ::testing::Test {
+class SupervisedUserServiceTest : public ::testing::Test {
  public:
-  ManagedUserServiceTest() {}
+  SupervisedUserServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
     TestingProfile::Builder builder;
     builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
                               BuildFakeProfileOAuth2TokenService);
     profile_ = builder.Build();
-    managed_user_service_ =
-        ManagedUserServiceFactory::GetForProfile(profile_.get());
+    supervised_user_service_ =
+        SupervisedUserServiceFactory::GetForProfile(profile_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     profile_.reset();
   }
 
-  virtual ~ManagedUserServiceTest() {}
+  virtual ~SupervisedUserServiceTest() {}
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
-  ManagedUserService* managed_user_service_;
+  SupervisedUserService* supervised_user_service_;
 };
 
 }  // namespace
 
-TEST_F(ManagedUserServiceTest, GetManualExceptionsForHost) {
+TEST_F(SupervisedUserServiceTest, GetManualExceptionsForHost) {
   GURL kExampleFooURL("http://www.example.com/foo");
   GURL kExampleBarURL("http://www.example.com/bar");
   GURL kExampleFooNoWWWURL("http://example.com/foo");
@@ -111,20 +112,20 @@ TEST_F(ManagedUserServiceTest, GetManualExceptionsForHost) {
     dict->SetBooleanWithoutPathExpansion(kBlurpURL.spec(), true);
   }
 
-  EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
-            managed_user_service_->GetManualBehaviorForURL(kExampleFooURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_BLOCK,
-            managed_user_service_->GetManualBehaviorForURL(kExampleBarURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
-            managed_user_service_->GetManualBehaviorForURL(
+  EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
+            supervised_user_service_->GetManualBehaviorForURL(kExampleFooURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_BLOCK,
+            supervised_user_service_->GetManualBehaviorForURL(kExampleBarURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
+            supervised_user_service_->GetManualBehaviorForURL(
                 kExampleFooNoWWWURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
-            managed_user_service_->GetManualBehaviorForURL(kBlurpURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_NONE,
-            managed_user_service_->GetManualBehaviorForURL(kMooseURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
+            supervised_user_service_->GetManualBehaviorForURL(kBlurpURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
+            supervised_user_service_->GetManualBehaviorForURL(kMooseURL));
   std::vector<GURL> exceptions;
-  managed_user_service_->GetManualExceptionsForHost("www.example.com",
-                                                    &exceptions);
+  supervised_user_service_->GetManualExceptionsForHost("www.example.com",
+                                                       &exceptions);
   ASSERT_EQ(2u, exceptions.size());
   EXPECT_EQ(kExampleBarURL, exceptions[0]);
   EXPECT_EQ(kExampleFooURL, exceptions[1]);
@@ -139,22 +140,22 @@ TEST_F(ManagedUserServiceTest, GetManualExceptionsForHost) {
     }
   }
 
-  EXPECT_EQ(ManagedUserService::MANUAL_NONE,
-            managed_user_service_->GetManualBehaviorForURL(kExampleFooURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_NONE,
-            managed_user_service_->GetManualBehaviorForURL(kExampleBarURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
-            managed_user_service_->GetManualBehaviorForURL(
+  EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
+            supervised_user_service_->GetManualBehaviorForURL(kExampleFooURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
+            supervised_user_service_->GetManualBehaviorForURL(kExampleBarURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
+            supervised_user_service_->GetManualBehaviorForURL(
                 kExampleFooNoWWWURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
-            managed_user_service_->GetManualBehaviorForURL(kBlurpURL));
-  EXPECT_EQ(ManagedUserService::MANUAL_NONE,
-            managed_user_service_->GetManualBehaviorForURL(kMooseURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_ALLOW,
+            supervised_user_service_->GetManualBehaviorForURL(kBlurpURL));
+  EXPECT_EQ(SupervisedUserService::MANUAL_NONE,
+            supervised_user_service_->GetManualBehaviorForURL(kMooseURL));
 }
 
 // Ensure that the CustodianProfileDownloaderService shuts down cleanly. If no
 // DCHECK is hit when the service is destroyed, this test passed.
-TEST_F(ManagedUserServiceTest, ShutDownCustodianProfileDownloader) {
+TEST_F(SupervisedUserServiceTest, ShutDownCustodianProfileDownloader) {
   CustodianProfileDownloaderService* downloader_service =
       CustodianProfileDownloaderServiceFactory::GetForProfile(profile_.get());
 
@@ -165,27 +166,27 @@ TEST_F(ManagedUserServiceTest, ShutDownCustodianProfileDownloader) {
 }
 
 #if !defined(OS_ANDROID)
-class ManagedUserServiceExtensionTestBase
+class SupervisedUserServiceExtensionTestBase
     : public extensions::ExtensionServiceTestBase {
  public:
-  explicit ManagedUserServiceExtensionTestBase(bool is_managed)
-      : is_managed_(is_managed),
+  explicit SupervisedUserServiceExtensionTestBase(bool is_supervised)
+      : is_supervised_(is_supervised),
         channel_(chrome::VersionInfo::CHANNEL_DEV) {}
-  virtual ~ManagedUserServiceExtensionTestBase() {}
+  virtual ~SupervisedUserServiceExtensionTestBase() {}
 
   virtual void SetUp() OVERRIDE {
     ExtensionServiceTestBase::SetUp();
     ExtensionServiceTestBase::ExtensionServiceInitParams params =
         CreateDefaultInitParams();
-    params.profile_is_supervised = is_managed_;
+    params.profile_is_supervised = is_supervised_;
     InitializeExtensionService(params);
-    ManagedUserServiceFactory::GetForProfile(profile_.get())->Init();
+    SupervisedUserServiceFactory::GetForProfile(profile_.get())->Init();
   }
 
  protected:
-  ScopedVector<ManagedModeSiteList> GetActiveSiteLists(
-      ManagedUserService* managed_user_service) {
-    return managed_user_service->GetActiveSiteLists();
+  ScopedVector<SupervisedUserSiteList> GetActiveSiteLists(
+      SupervisedUserService* supervised_user_service) {
+    return supervised_user_service->GetActiveSiteLists();
   }
 
   scoped_refptr<extensions::Extension> MakeThemeExtension() {
@@ -210,46 +211,47 @@ class ManagedUserServiceExtensionTestBase
     return extension;
   }
 
-  bool is_managed_;
+  bool is_supervised_;
   extensions::ScopedCurrentChannel channel_;
 };
 
-class ManagedUserServiceExtensionTestUnmanaged
-    : public ManagedUserServiceExtensionTestBase {
+class SupervisedUserServiceExtensionTestUnsupervised
+    : public SupervisedUserServiceExtensionTestBase {
  public:
-  ManagedUserServiceExtensionTestUnmanaged()
-      : ManagedUserServiceExtensionTestBase(false) {}
+  SupervisedUserServiceExtensionTestUnsupervised()
+      : SupervisedUserServiceExtensionTestBase(false) {}
 };
 
-class ManagedUserServiceExtensionTest
-    : public ManagedUserServiceExtensionTestBase {
+class SupervisedUserServiceExtensionTest
+    : public SupervisedUserServiceExtensionTestBase {
  public:
-  ManagedUserServiceExtensionTest()
-      : ManagedUserServiceExtensionTestBase(true) {}
+  SupervisedUserServiceExtensionTest()
+      : SupervisedUserServiceExtensionTestBase(true) {}
 };
 
-TEST_F(ManagedUserServiceExtensionTestUnmanaged,
+TEST_F(SupervisedUserServiceExtensionTestUnsupervised,
        ExtensionManagementPolicyProvider) {
-  ManagedUserService* managed_user_service =
-      ManagedUserServiceFactory::GetForProfile(profile_.get());
+  SupervisedUserService* supervised_user_service =
+      SupervisedUserServiceFactory::GetForProfile(profile_.get());
   EXPECT_FALSE(profile_->IsSupervised());
 
   scoped_refptr<extensions::Extension> extension = MakeExtension();
   base::string16 error_1;
-  EXPECT_TRUE(managed_user_service->UserMayLoad(extension.get(), &error_1));
+  EXPECT_TRUE(supervised_user_service->UserMayLoad(extension.get(), &error_1));
   EXPECT_EQ(base::string16(), error_1);
 
   base::string16 error_2;
   EXPECT_TRUE(
-      managed_user_service->UserMayModifySettings(extension.get(), &error_2));
+      supervised_user_service->UserMayModifySettings(extension.get(),
+                                                     &error_2));
   EXPECT_EQ(base::string16(), error_2);
 }
 
-TEST_F(ManagedUserServiceExtensionTest, ExtensionManagementPolicyProvider) {
-  ManagedUserService* managed_user_service =
-      ManagedUserServiceFactory::GetForProfile(profile_.get());
-  ManagedModeURLFilterObserver observer(
-      managed_user_service->GetURLFilterForUIThread());
+TEST_F(SupervisedUserServiceExtensionTest, ExtensionManagementPolicyProvider) {
+  SupervisedUserService* supervised_user_service =
+      SupervisedUserServiceFactory::GetForProfile(profile_.get());
+  SupervisedUserURLFilterObserver observer(
+      supervised_user_service->GetURLFilterForUIThread());
   ASSERT_TRUE(profile_->IsSupervised());
   // Wait for the initial update to finish (otherwise we'll get leaks).
   observer.Wait();
@@ -257,67 +259,68 @@ TEST_F(ManagedUserServiceExtensionTest, ExtensionManagementPolicyProvider) {
   // Check that a supervised user can install a theme.
   scoped_refptr<extensions::Extension> theme = MakeThemeExtension();
   base::string16 error_1;
-  EXPECT_TRUE(managed_user_service->UserMayLoad(theme.get(), &error_1));
+  EXPECT_TRUE(supervised_user_service->UserMayLoad(theme.get(), &error_1));
   EXPECT_TRUE(error_1.empty());
   EXPECT_TRUE(
-      managed_user_service->UserMayModifySettings(theme.get(), &error_1));
+      supervised_user_service->UserMayModifySettings(theme.get(), &error_1));
   EXPECT_TRUE(error_1.empty());
 
   // Now check a different kind of extension.
   scoped_refptr<extensions::Extension> extension = MakeExtension();
-  EXPECT_FALSE(managed_user_service->UserMayLoad(extension.get(), &error_1));
+  EXPECT_FALSE(supervised_user_service->UserMayLoad(extension.get(), &error_1));
   EXPECT_FALSE(error_1.empty());
 
   base::string16 error_2;
   EXPECT_FALSE(
-      managed_user_service->UserMayModifySettings(extension.get(), &error_2));
+      supervised_user_service->UserMayModifySettings(extension.get(),
+                                                     &error_2));
   EXPECT_FALSE(error_2.empty());
 
 #ifndef NDEBUG
-  EXPECT_FALSE(managed_user_service->GetDebugPolicyProviderName().empty());
+  EXPECT_FALSE(supervised_user_service->GetDebugPolicyProviderName().empty());
 #endif
 }
 
-TEST_F(ManagedUserServiceExtensionTest, NoContentPacks) {
-  ManagedUserService* managed_user_service =
-      ManagedUserServiceFactory::GetForProfile(profile_.get());
-  ManagedModeURLFilter* url_filter =
-      managed_user_service->GetURLFilterForUIThread();
+TEST_F(SupervisedUserServiceExtensionTest, NoContentPacks) {
+  SupervisedUserService* supervised_user_service =
+      SupervisedUserServiceFactory::GetForProfile(profile_.get());
+  SupervisedUserURLFilter* url_filter =
+      supervised_user_service->GetURLFilterForUIThread();
 
   GURL url("http://youtube.com");
-  ScopedVector<ManagedModeSiteList> site_lists =
-      GetActiveSiteLists(managed_user_service);
+  ScopedVector<SupervisedUserSiteList> site_lists =
+      GetActiveSiteLists(supervised_user_service);
   ASSERT_EQ(0u, site_lists.size());
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(url));
 }
 
-TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
-  ManagedUserService* managed_user_service =
-      ManagedUserServiceFactory::GetForProfile(profile_.get());
-  ManagedModeURLFilter* url_filter =
-      managed_user_service->GetURLFilterForUIThread();
-  ManagedModeURLFilterObserver observer(url_filter);
+TEST_F(SupervisedUserServiceExtensionTest, InstallContentPacks) {
+  SupervisedUserService* supervised_user_service =
+      SupervisedUserServiceFactory::GetForProfile(profile_.get());
+  SupervisedUserURLFilter* url_filter =
+      supervised_user_service->GetURLFilterForUIThread();
+  SupervisedUserURLFilterObserver observer(url_filter);
   observer.Wait();
 
   GURL example_url("http://example.com");
   GURL moose_url("http://moose.org");
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(example_url));
 
   profile_->GetPrefs()->SetInteger(
       prefs::kDefaultSupervisedUserFilteringBehavior,
-      ManagedModeURLFilter::BLOCK);
-  EXPECT_EQ(ManagedModeURLFilter::BLOCK,
+      SupervisedUserURLFilter::BLOCK);
+  EXPECT_EQ(SupervisedUserURLFilter::BLOCK,
             url_filter->GetFilteringBehaviorForURL(example_url));
 
   profile_->GetPrefs()->SetInteger(
       prefs::kDefaultSupervisedUserFilteringBehavior,
-      ManagedModeURLFilter::WARN);
-  EXPECT_EQ(ManagedModeURLFilter::WARN,
+      SupervisedUserURLFilter::WARN);
+  EXPECT_EQ(SupervisedUserURLFilter::WARN,
             url_filter->GetFilteringBehaviorForURL(example_url));
 
-  managed_user_service->set_elevated_for_testing(true);
+  supervised_user_service->set_elevated_for_testing(true);
 
   // Load a content pack.
   scoped_refptr<extensions::UnpackedInstaller> installer(
@@ -339,19 +342,19 @@ TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
       make_scoped_refptr(details.ptr());
   ASSERT_TRUE(extension.get());
 
-  ScopedVector<ManagedModeSiteList> site_lists =
-      GetActiveSiteLists(managed_user_service);
+  ScopedVector<SupervisedUserSiteList> site_lists =
+      GetActiveSiteLists(supervised_user_service);
   ASSERT_EQ(1u, site_lists.size());
-  std::vector<ManagedModeSiteList::Site> sites;
+  std::vector<SupervisedUserSiteList::Site> sites;
   site_lists[0]->GetSites(&sites);
   ASSERT_EQ(3u, sites.size());
   EXPECT_EQ(base::ASCIIToUTF16("YouTube"), sites[0].name);
   EXPECT_EQ(base::ASCIIToUTF16("Homestar Runner"), sites[1].name);
   EXPECT_EQ(base::string16(), sites[2].name);
 
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(example_url));
-  EXPECT_EQ(ManagedModeURLFilter::WARN,
+  EXPECT_EQ(SupervisedUserURLFilter::WARN,
             url_filter->GetFilteringBehaviorForURL(moose_url));
 
   // Load a second content pack.
@@ -361,7 +364,7 @@ TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
   installer->Load(extension_path);
   observer.Wait();
 
-  site_lists = GetActiveSiteLists(managed_user_service);
+  site_lists = GetActiveSiteLists(supervised_user_service);
   ASSERT_EQ(2u, site_lists.size());
   sites.clear();
   site_lists[0]->GetSites(&sites);
@@ -369,7 +372,7 @@ TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
   ASSERT_EQ(4u, sites.size());
   // The site lists might be returned in any order, so we put them into a set.
   std::set<std::string> site_names;
-  for (std::vector<ManagedModeSiteList::Site>::const_iterator it =
+  for (std::vector<SupervisedUserSiteList::Site>::const_iterator it =
       sites.begin(); it != sites.end(); ++it) {
     site_names.insert(base::UTF16ToUTF8(it->name));
   }
@@ -378,9 +381,9 @@ TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
   EXPECT_TRUE(site_names.count(std::string()) == 1u);
   EXPECT_TRUE(site_names.count("Moose") == 1u);
 
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(example_url));
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(moose_url));
 
   // Disable the first content pack.
@@ -388,16 +391,16 @@ TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
                              extensions::Extension::DISABLE_USER_ACTION);
   observer.Wait();
 
-  site_lists = GetActiveSiteLists(managed_user_service);
+  site_lists = GetActiveSiteLists(supervised_user_service);
   ASSERT_EQ(1u, site_lists.size());
   sites.clear();
   site_lists[0]->GetSites(&sites);
   ASSERT_EQ(1u, sites.size());
   EXPECT_EQ(base::ASCIIToUTF16("Moose"), sites[0].name);
 
-  EXPECT_EQ(ManagedModeURLFilter::WARN,
+  EXPECT_EQ(SupervisedUserURLFilter::WARN,
             url_filter->GetFilteringBehaviorForURL(example_url));
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
+  EXPECT_EQ(SupervisedUserURLFilter::ALLOW,
             url_filter->GetFilteringBehaviorForURL(moose_url));
 }
 #endif  // !defined(OS_ANDROID)