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

Side by Side Diff: chrome/browser/managed_mode/managed_user_service_unittest.cc

Issue 12225051: Initialize ManagedUserService after ExtensionSystem to register as extension management policy prov… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/extensions/extension_service_unittest.h" 7 #include "chrome/browser/extensions/extension_service_unittest.h"
8 #include "chrome/browser/extensions/unpacked_installer.h" 8 #include "chrome/browser/extensions/unpacked_installer.h"
9 #include "chrome/browser/managed_mode/managed_user_service.h" 9 #include "chrome/browser/managed_mode/managed_user_service.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 EXPECT_TRUE(managed_user_service.UserMayModifySettings(NULL, &error_2)); 68 EXPECT_TRUE(managed_user_service.UserMayModifySettings(NULL, &error_2));
69 EXPECT_EQ(string16(), error_2); 69 EXPECT_EQ(string16(), error_2);
70 } 70 }
71 71
72 profile.GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true); 72 profile.GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
73 { 73 {
74 ManagedUserService managed_user_service(&profile); 74 ManagedUserService managed_user_service(&profile);
75 ManagedModeURLFilterObserver observer( 75 ManagedModeURLFilterObserver observer(
76 managed_user_service.GetURLFilterForUIThread()); 76 managed_user_service.GetURLFilterForUIThread());
77 EXPECT_TRUE(managed_user_service.ProfileIsManaged()); 77 EXPECT_TRUE(managed_user_service.ProfileIsManaged());
78 managed_user_service.Init();
78 79
79 string16 error_1; 80 string16 error_1;
80 EXPECT_FALSE(managed_user_service.UserMayLoad(NULL, &error_1)); 81 EXPECT_FALSE(managed_user_service.UserMayLoad(NULL, &error_1));
81 EXPECT_FALSE(error_1.empty()); 82 EXPECT_FALSE(error_1.empty());
82 83
83 string16 error_2; 84 string16 error_2;
84 EXPECT_FALSE(managed_user_service.UserMayModifySettings(NULL, &error_2)); 85 EXPECT_FALSE(managed_user_service.UserMayModifySettings(NULL, &error_2));
85 EXPECT_FALSE(error_2.empty()); 86 EXPECT_FALSE(error_2.empty());
86 87
87 #ifndef NDEBUG 88 #ifndef NDEBUG
(...skipping 16 matching lines...) Expand all
104 105
105 protected: 106 protected:
106 ScopedVector<ManagedModeSiteList> GetActiveSiteLists( 107 ScopedVector<ManagedModeSiteList> GetActiveSiteLists(
107 ManagedUserService* managed_user_service) { 108 ManagedUserService* managed_user_service) {
108 return managed_user_service->GetActiveSiteLists(); 109 return managed_user_service->GetActiveSiteLists();
109 } 110 }
110 }; 111 };
111 112
112 TEST_F(ManagedUserServiceExtensionTest, NoContentPacks) { 113 TEST_F(ManagedUserServiceExtensionTest, NoContentPacks) {
113 ManagedUserService managed_user_service(profile_.get()); 114 ManagedUserService managed_user_service(profile_.get());
115 managed_user_service.Init();
114 ManagedModeURLFilter* url_filter = 116 ManagedModeURLFilter* url_filter =
115 managed_user_service.GetURLFilterForUIThread(); 117 managed_user_service.GetURLFilterForUIThread();
116 118
117 GURL url("http://youtube.com"); 119 GURL url("http://youtube.com");
118 ScopedVector<ManagedModeSiteList> site_lists = 120 ScopedVector<ManagedModeSiteList> site_lists =
119 GetActiveSiteLists(&managed_user_service); 121 GetActiveSiteLists(&managed_user_service);
120 ASSERT_EQ(0u, site_lists.size()); 122 ASSERT_EQ(0u, site_lists.size());
121 EXPECT_EQ(ManagedModeURLFilter::ALLOW, 123 EXPECT_EQ(ManagedModeURLFilter::ALLOW,
122 url_filter->GetFilteringBehaviorForURL(url)); 124 url_filter->GetFilteringBehaviorForURL(url));
123 } 125 }
124 126
125 TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) { 127 TEST_F(ManagedUserServiceExtensionTest, InstallContentPacks) {
126 profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true); 128 profile_->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
127 ManagedUserService managed_user_service(profile_.get()); 129 ManagedUserService managed_user_service(profile_.get());
130 managed_user_service.Init();
128 managed_user_service.SetElevatedForTesting(true); 131 managed_user_service.SetElevatedForTesting(true);
129 ManagedModeURLFilter* url_filter = 132 ManagedModeURLFilter* url_filter =
130 managed_user_service.GetURLFilterForUIThread(); 133 managed_user_service.GetURLFilterForUIThread();
131 ManagedModeURLFilterObserver observer(url_filter); 134 ManagedModeURLFilterObserver observer(url_filter);
132 observer.Wait(); 135 observer.Wait();
133 136
134 GURL example_url("http://example.com"); 137 GURL example_url("http://example.com");
135 GURL moose_url("http://moose.org"); 138 GURL moose_url("http://moose.org");
136 EXPECT_EQ(ManagedModeURLFilter::BLOCK, 139 EXPECT_EQ(ManagedModeURLFilter::BLOCK,
137 url_filter->GetFilteringBehaviorForURL(example_url)); 140 url_filter->GetFilteringBehaviorForURL(example_url));
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 sites.clear(); 218 sites.clear();
216 site_lists[0]->GetSites(&sites); 219 site_lists[0]->GetSites(&sites);
217 ASSERT_EQ(1u, sites.size()); 220 ASSERT_EQ(1u, sites.size());
218 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name); 221 EXPECT_EQ(ASCIIToUTF16("Moose"), sites[0].name);
219 222
220 EXPECT_EQ(ManagedModeURLFilter::WARN, 223 EXPECT_EQ(ManagedModeURLFilter::WARN,
221 url_filter->GetFilteringBehaviorForURL(example_url)); 224 url_filter->GetFilteringBehaviorForURL(example_url));
222 EXPECT_EQ(ManagedModeURLFilter::ALLOW, 225 EXPECT_EQ(ManagedModeURLFilter::ALLOW,
223 url_filter->GetFilteringBehaviorForURL(moose_url)); 226 url_filter->GetFilteringBehaviorForURL(moose_url));
224 } 227 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698