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

Unified Diff: chrome/browser/managed_mode/managed_user_service_unittest.cc

Issue 18337013: Update ManagedUserService tests to create the service using ManagedUserServiceFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bauerb@... Created 7 years, 5 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
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/managed_mode/managed_user_service_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc
index caff2c87f130d9d45b09bd01e651b82e6c1a465a..3a477324d37c32ae98fb4f165afe5804c0114b9a 100644
--- a/chrome/browser/managed_mode/managed_user_service_unittest.cc
+++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc
@@ -58,47 +58,49 @@ class ManagedModeURLFilterObserver : public ManagedModeURLFilter::Observer {
class ManagedUserServiceTest : public ::testing::Test {
public:
ManagedUserServiceTest() : ui_thread_(content::BrowserThread::UI,
- &message_loop_),
- managed_user_service_(&profile_) {}
+ &message_loop_) {
+ managed_user_service_ = ManagedUserServiceFactory::GetForProfile(&profile_);
+ }
+
virtual ~ManagedUserServiceTest() {}
protected:
base::MessageLoop message_loop_;
content::TestBrowserThread ui_thread_;
TestingProfile profile_;
- ManagedUserService managed_user_service_;
+ ManagedUserService* managed_user_service_;
};
} // namespace
TEST_F(ManagedUserServiceTest, ExtensionManagementPolicyProviderUnmanaged) {
- EXPECT_FALSE(managed_user_service_.ProfileIsManaged());
+ EXPECT_FALSE(managed_user_service_->ProfileIsManaged());
string16 error_1;
- EXPECT_TRUE(managed_user_service_.UserMayLoad(NULL, &error_1));
+ EXPECT_TRUE(managed_user_service_->UserMayLoad(NULL, &error_1));
EXPECT_EQ(string16(), error_1);
string16 error_2;
- EXPECT_TRUE(managed_user_service_.UserMayModifySettings(NULL, &error_2));
+ EXPECT_TRUE(managed_user_service_->UserMayModifySettings(NULL, &error_2));
EXPECT_EQ(string16(), error_2);
}
TEST_F(ManagedUserServiceTest, ExtensionManagementPolicyProviderManaged) {
ManagedModeURLFilterObserver observer(
- managed_user_service_.GetURLFilterForUIThread());
- managed_user_service_.InitForTesting();
- EXPECT_TRUE(managed_user_service_.ProfileIsManaged());
+ managed_user_service_->GetURLFilterForUIThread());
+ managed_user_service_->InitForTesting();
+ EXPECT_TRUE(managed_user_service_->ProfileIsManaged());
string16 error_1;
- EXPECT_FALSE(managed_user_service_.UserMayLoad(NULL, &error_1));
+ EXPECT_FALSE(managed_user_service_->UserMayLoad(NULL, &error_1));
EXPECT_FALSE(error_1.empty());
string16 error_2;
- EXPECT_FALSE(managed_user_service_.UserMayModifySettings(NULL, &error_2));
+ EXPECT_FALSE(managed_user_service_->UserMayModifySettings(NULL, &error_2));
EXPECT_FALSE(error_2.empty());
#ifndef NDEBUG
- EXPECT_FALSE(managed_user_service_.GetDebugPolicyProviderName().empty());
+ EXPECT_FALSE(managed_user_service_->GetDebugPolicyProviderName().empty());
#endif
// Wait for the initial update to finish (otherwise we'll get leaks).
observer.Wait();
@@ -121,18 +123,19 @@ TEST_F(ManagedUserServiceTest, GetManualExceptionsForHost) {
}
EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
- managed_user_service_.GetManualBehaviorForURL(kExampleFooURL));
+ managed_user_service_->GetManualBehaviorForURL(kExampleFooURL));
EXPECT_EQ(ManagedUserService::MANUAL_BLOCK,
- managed_user_service_.GetManualBehaviorForURL(kExampleBarURL));
+ managed_user_service_->GetManualBehaviorForURL(kExampleBarURL));
EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
- managed_user_service_.GetManualBehaviorForURL(kExampleFooNoWWWURL));
+ managed_user_service_->GetManualBehaviorForURL(
+ kExampleFooNoWWWURL));
EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
- managed_user_service_.GetManualBehaviorForURL(kBlurpURL));
+ managed_user_service_->GetManualBehaviorForURL(kBlurpURL));
EXPECT_EQ(ManagedUserService::MANUAL_NONE,
- managed_user_service_.GetManualBehaviorForURL(kMooseURL));
+ managed_user_service_->GetManualBehaviorForURL(kMooseURL));
std::vector<GURL> exceptions;
- managed_user_service_.GetManualExceptionsForHost("www.example.com",
- &exceptions);
+ managed_user_service_->GetManualExceptionsForHost("www.example.com",
+ &exceptions);
ASSERT_EQ(2u, exceptions.size());
EXPECT_EQ(kExampleBarURL, exceptions[0]);
EXPECT_EQ(kExampleFooURL, exceptions[1]);
@@ -148,15 +151,16 @@ TEST_F(ManagedUserServiceTest, GetManualExceptionsForHost) {
}
EXPECT_EQ(ManagedUserService::MANUAL_NONE,
- managed_user_service_.GetManualBehaviorForURL(kExampleFooURL));
+ managed_user_service_->GetManualBehaviorForURL(kExampleFooURL));
EXPECT_EQ(ManagedUserService::MANUAL_NONE,
- managed_user_service_.GetManualBehaviorForURL(kExampleBarURL));
+ managed_user_service_->GetManualBehaviorForURL(kExampleBarURL));
EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
- managed_user_service_.GetManualBehaviorForURL(kExampleFooNoWWWURL));
+ managed_user_service_->GetManualBehaviorForURL(
+ kExampleFooNoWWWURL));
EXPECT_EQ(ManagedUserService::MANUAL_ALLOW,
- managed_user_service_.GetManualBehaviorForURL(kBlurpURL));
+ managed_user_service_->GetManualBehaviorForURL(kBlurpURL));
EXPECT_EQ(ManagedUserService::MANUAL_NONE,
- managed_user_service_.GetManualBehaviorForURL(kMooseURL));
+ managed_user_service_->GetManualBehaviorForURL(kMooseURL));
}
class ManagedUserServiceExtensionTest : public ExtensionServiceTestBase {
@@ -181,14 +185,15 @@ class ManagedUserServiceExtensionTest : public ExtensionServiceTestBase {
};
TEST_F(ManagedUserServiceExtensionTest, NoContentPacks) {
- ManagedUserService managed_user_service(profile_.get());
- managed_user_service.Init();
+ ManagedUserService* managed_user_service =
+ ManagedUserServiceFactory::GetForProfile(profile_.get());
+ managed_user_service->Init();
ManagedModeURLFilter* url_filter =
- managed_user_service.GetURLFilterForUIThread();
+ managed_user_service->GetURLFilterForUIThread();
GURL url("http://youtube.com");
ScopedVector<ManagedModeSiteList> site_lists =
- GetActiveSiteLists(&managed_user_service);
+ GetActiveSiteLists(managed_user_service);
ASSERT_EQ(0u, site_lists.size());
EXPECT_EQ(ManagedModeURLFilter::ALLOW,
url_filter->GetFilteringBehaviorForURL(url));
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698