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

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

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 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/managed_mode/managed_mode_resource_throttle_browsertest.cc
diff --git a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc b/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
index 8fc1a5364f3f3ca4478ed78e50d4f67903b75cb0..a88cc1e0bfe4fa959e1c5234bc29dd2cba1c4bd8 100644
--- a/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
+++ b/chrome/browser/managed_mode/managed_mode_resource_throttle_browsertest.cc
@@ -6,11 +6,11 @@
#include "base/prefs/pref_service.h"
#include "base/values.h"
+#include "chrome/browser/managed_mode/managed_user_constants.h"
#include "chrome/browser/managed_mode/managed_user_service.h"
#include "chrome/browser/managed_mode/managed_user_service_factory.h"
-#include "chrome/browser/policy/managed_mode_policy_provider.h"
-#include "chrome/browser/policy/profile_policy_connector.h"
-#include "chrome/browser/policy/profile_policy_connector_factory.h"
+#include "chrome/browser/managed_mode/managed_user_settings_sync_service.h"
+#include "chrome/browser/managed_mode/managed_user_settings_sync_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -21,7 +21,6 @@
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
#include "content/public/test/test_utils.h"
-#include "policy/policy_constants.h"
using content::MessageLoopRunner;
using content::NavigationController;
@@ -49,15 +48,12 @@ void ManagedModeResourceThrottleTest::SetUpOnMainThread() {
IN_PROC_BROWSER_TEST_F(ManagedModeResourceThrottleTest,
NoNavigationObserverBlock) {
Profile* profile = browser()->profile();
- policy::ProfilePolicyConnector* connector =
- policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
- policy::ManagedModePolicyProvider* policy_provider =
- connector->managed_mode_policy_provider();
- policy_provider->SetLocalPolicyForTesting(
- policy::key::kContentPackDefaultFilteringBehavior,
+ ManagedUserSettingsService* managed_user_settings_service =
+ ManagedUserSettingsServiceFactory::GetForProfile(profile);
+ managed_user_settings_service->SetLocalSettingForTesting(
+ managed_users::kContentPackDefaultFilteringBehavior,
scoped_ptr<base::Value>(
new base::FundamentalValue(ManagedModeURLFilter::BLOCK)));
- base::RunLoop().RunUntilIdle();
scoped_ptr<WebContents> web_contents(
WebContents::Create(WebContents::CreateParams(profile)));

Powered by Google App Engine
This is Rietveld 408576698