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

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

Issue 10823169: Another attempt at fixing dead frames being tracked by webNavigation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 8 years, 4 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) 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.h" 10 #include "chrome/browser/policy/policy_service.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 PrefService* TestingBrowserProcess::local_state() { 64 PrefService* TestingBrowserProcess::local_state() {
65 return local_state_; 65 return local_state_;
66 } 66 }
67 67
68 chrome_variations::VariationsService* 68 chrome_variations::VariationsService*
69 TestingBrowserProcess::variations_service() { 69 TestingBrowserProcess::variations_service() {
70 return NULL; 70 return NULL;
71 } 71 }
72 72
73 ChromeResourceDispatcherHostDelegate*
74 TestingBrowserProcess::resource_dispatcher_host_delegate() {
75 return NULL;
76 }
77
73 policy::BrowserPolicyConnector* 78 policy::BrowserPolicyConnector*
74 TestingBrowserProcess::browser_policy_connector() { 79 TestingBrowserProcess::browser_policy_connector() {
75 #if defined(ENABLE_CONFIGURATION_POLICY) 80 #if defined(ENABLE_CONFIGURATION_POLICY)
76 if (!browser_policy_connector_.get()) 81 if (!browser_policy_connector_.get())
77 browser_policy_connector_.reset(new policy::BrowserPolicyConnector()); 82 browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
78 #endif 83 #endif
79 return browser_policy_connector_.get(); 84 return browser_policy_connector_.get();
80 } 85 }
81 86
82 policy::PolicyService* TestingBrowserProcess::policy_service() { 87 policy::PolicyService* TestingBrowserProcess::policy_service() {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 265
261 void TestingBrowserProcess::SetBrowserPolicyConnector( 266 void TestingBrowserProcess::SetBrowserPolicyConnector(
262 policy::BrowserPolicyConnector* connector) { 267 policy::BrowserPolicyConnector* connector) {
263 browser_policy_connector_.reset(connector); 268 browser_policy_connector_.reset(connector);
264 } 269 }
265 270
266 void TestingBrowserProcess::SetSafeBrowsingService( 271 void TestingBrowserProcess::SetSafeBrowsingService(
267 SafeBrowsingService* sb_service) { 272 SafeBrowsingService* sb_service) {
268 sb_service_ = sb_service; 273 sb_service_ = sb_service;
269 } 274 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698