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

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

Issue 10392007: Restoring the chrome variatioons client, with a fix for browser_test failures caused by it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved comment Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/notifications/notification_ui_manager.h" 8 #include "chrome/browser/notifications/notification_ui_manager.h"
9 #include "chrome/browser/policy/browser_policy_connector.h" 9 #include "chrome/browser/policy/browser_policy_connector.h"
10 #include "chrome/browser/policy/policy_service_impl.h" 10 #include "chrome/browser/policy/policy_service_impl.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) { 57 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) {
58 profile_manager_.reset(profile_manager); 58 profile_manager_.reset(profile_manager);
59 } 59 }
60 60
61 PrefService* TestingBrowserProcess::local_state() { 61 PrefService* TestingBrowserProcess::local_state() {
62 return local_state_; 62 return local_state_;
63 } 63 }
64 64
65 VariationsService* TestingBrowserProcess::variations_service() {
66 return NULL;
67 }
68
65 policy::BrowserPolicyConnector* 69 policy::BrowserPolicyConnector*
66 TestingBrowserProcess::browser_policy_connector() { 70 TestingBrowserProcess::browser_policy_connector() {
67 #if defined(ENABLE_CONFIGURATION_POLICY) 71 #if defined(ENABLE_CONFIGURATION_POLICY)
68 if (!browser_policy_connector_.get()) 72 if (!browser_policy_connector_.get())
69 browser_policy_connector_.reset(new policy::BrowserPolicyConnector()); 73 browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
70 #endif 74 #endif
71 return browser_policy_connector_.get(); 75 return browser_policy_connector_.get();
72 } 76 }
73 77
74 policy::PolicyService* TestingBrowserProcess::policy_service() { 78 policy::PolicyService* TestingBrowserProcess::policy_service() {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 259
256 void TestingBrowserProcess::SetBrowserPolicyConnector( 260 void TestingBrowserProcess::SetBrowserPolicyConnector(
257 policy::BrowserPolicyConnector* connector) { 261 policy::BrowserPolicyConnector* connector) {
258 browser_policy_connector_.reset(connector); 262 browser_policy_connector_.reset(connector);
259 } 263 }
260 264
261 void TestingBrowserProcess::SetSafeBrowsingService( 265 void TestingBrowserProcess::SetSafeBrowsingService(
262 SafeBrowsingService* sb_service) { 266 SafeBrowsingService* sb_service) {
263 sb_service_ = sb_service; 267 sb_service_ = sb_service;
264 } 268 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698