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

Side by Side Diff: chrome/test/base/testing_browser_process.cc

Issue 8586030: Added ConfigurationPolicyProvider::RefreshPolicies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: BrowserPolicyConnector is less static; addressed comments Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/test/base/testing_browser_process.h" 5 #include "chrome/test/base/testing_browser_process.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/google/google_url_tracker.h" 8 #include "chrome/browser/google/google_url_tracker.h"
9 #include "chrome/browser/notifications/notification_ui_manager.h" 9 #include "chrome/browser/notifications/notification_ui_manager.h"
10 #include "chrome/browser/policy/browser_policy_connector.h" 10 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 profile_manager_.reset(profile_manager); 74 profile_manager_.reset(profile_manager);
75 } 75 }
76 76
77 PrefService* TestingBrowserProcess::local_state() { 77 PrefService* TestingBrowserProcess::local_state() {
78 return local_state_; 78 return local_state_;
79 } 79 }
80 80
81 policy::BrowserPolicyConnector* 81 policy::BrowserPolicyConnector*
82 TestingBrowserProcess::browser_policy_connector() { 82 TestingBrowserProcess::browser_policy_connector() {
83 #if defined(ENABLE_CONFIGURATION_POLICY) 83 #if defined(ENABLE_CONFIGURATION_POLICY)
84 if (!browser_policy_connector_.get()) { 84 if (!browser_policy_connector_.get())
85 browser_policy_connector_.reset( 85 browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
86 policy::BrowserPolicyConnector::CreateForTests());
87 }
88 #endif 86 #endif
89 return browser_policy_connector_.get(); 87 return browser_policy_connector_.get();
90 } 88 }
91 89
92 IconManager* TestingBrowserProcess::icon_manager() { 90 IconManager* TestingBrowserProcess::icon_manager() {
93 return NULL; 91 return NULL;
94 } 92 }
95 93
96 ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() { 94 ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() {
97 return NULL; 95 return NULL;
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 } 270 }
273 271
274 void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) { 272 void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
275 devtools_manager_.reset(manager); 273 devtools_manager_.reset(manager);
276 } 274 }
277 275
278 void TestingBrowserProcess::SetBrowserPolicyConnector( 276 void TestingBrowserProcess::SetBrowserPolicyConnector(
279 policy::BrowserPolicyConnector* connector) { 277 policy::BrowserPolicyConnector* connector) {
280 browser_policy_connector_.reset(connector); 278 browser_policy_connector_.reset(connector);
281 } 279 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698