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

Unified Diff: chrome/test/testing_browser_process.cc

Issue 7096013: Allow device policy code to be optionally included. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make changes requested by torne. Created 9 years, 7 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/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_browser_process.cc
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
index 59b127524f9479d89eef3cd655e8eafb21a6ed09..5f55f685f4fcd617f50d889273c64f760c7a4542 100644
--- a/chrome/test/testing_browser_process.cc
+++ b/chrome/test/testing_browser_process.cc
@@ -88,15 +88,9 @@ PrefService* TestingBrowserProcess::local_state() {
policy::BrowserPolicyConnector*
TestingBrowserProcess::browser_policy_connector() {
- if (!browser_policy_connector_.get()) {
- const policy::ConfigurationPolicyProvider::PolicyDefinitionList*
- policy_list = policy::ConfigurationPolicyPrefStore::
- GetChromePolicyDefinitionList();
+ if (!browser_policy_connector_.get())
browser_policy_connector_.reset(
- new policy::BrowserPolicyConnector(
- new policy::DummyConfigurationPolicyProvider(policy_list),
- new policy::DummyConfigurationPolicyProvider(policy_list)));
- }
+ policy::BrowserPolicyConnector::CreateForTests());
return browser_policy_connector_.get();
}
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698