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

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

Issue 6598002: Make the ChromeNetworkDelegate use the ExtensionEventRouterForwarder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use profile id Created 9 years, 9 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) 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/testing_browser_process.h" 5 #include "chrome/test/testing_browser_process.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/synchronization/waitable_event.h" 8 #include "base/synchronization/waitable_event.h"
9 #include "chrome/browser/google/google_url_tracker.h" 9 #include "chrome/browser/google/google_url_tracker.h"
10 #include "chrome/browser/policy/browser_policy_connector.h" 10 #include "chrome/browser/policy/browser_policy_connector.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 } 110 }
111 111
112 ui::Clipboard* TestingBrowserProcess::clipboard() { 112 ui::Clipboard* TestingBrowserProcess::clipboard() {
113 if (!clipboard_.get()) { 113 if (!clipboard_.get()) {
114 // Note that we need a MessageLoop for the next call to work. 114 // Note that we need a MessageLoop for the next call to work.
115 clipboard_.reset(new ui::Clipboard); 115 clipboard_.reset(new ui::Clipboard);
116 } 116 }
117 return clipboard_.get(); 117 return clipboard_.get();
118 } 118 }
119 119
120 ExtensionEventRouterForwarder*
121 TestingBrowserProcess::extension_event_router_forwarder() {
122 return NULL;
123 }
124
120 NotificationUIManager* TestingBrowserProcess::notification_ui_manager() { 125 NotificationUIManager* TestingBrowserProcess::notification_ui_manager() {
121 return NULL; 126 return NULL;
122 } 127 }
123 128
124 GoogleURLTracker* TestingBrowserProcess::google_url_tracker() { 129 GoogleURLTracker* TestingBrowserProcess::google_url_tracker() {
125 return google_url_tracker_.get(); 130 return google_url_tracker_.get();
126 } 131 }
127 132
128 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() { 133 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() {
129 return NULL; 134 return NULL;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 218
214 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() { 219 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
215 DCHECK_EQ(browser_process_.get(), g_browser_process); 220 DCHECK_EQ(browser_process_.get(), g_browser_process);
216 221
217 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062. 222 // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
218 // After the transition is over, we should just 223 // After the transition is over, we should just
219 // reset |g_browser_process| to NULL. 224 // reset |g_browser_process| to NULL.
220 browser_process_.reset(); 225 browser_process_.reset();
221 g_browser_process = new TestingBrowserProcess(); 226 g_browser_process = new TestingBrowserProcess();
222 } 227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698