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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 6361002: Move SystemMonitor to src/chrome/common.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/worker/worker_main.cc ('k') | ui/base/system_monitor/system_monitor.h » ('j') | 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) 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_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 10
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 176 }
177 177
178 FakeExternalTab::~FakeExternalTab() { 178 FakeExternalTab::~FakeExternalTab() {
179 if (!overridden_user_dir_.empty()) { 179 if (!overridden_user_dir_.empty()) {
180 PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_); 180 PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_);
181 } 181 }
182 } 182 }
183 183
184 void FakeExternalTab::Initialize() { 184 void FakeExternalTab::Initialize() {
185 DCHECK(g_browser_process == NULL); 185 DCHECK(g_browser_process == NULL);
186 SystemMonitor system_monitor; 186 ui::SystemMonitor system_monitor;
187 187
188 // The gears plugin causes the PluginRequestInterceptor to kick in and it 188 // The gears plugin causes the PluginRequestInterceptor to kick in and it
189 // will cause problems when it tries to intercept URL requests. 189 // will cause problems when it tries to intercept URL requests.
190 PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath()); 190 PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath());
191 191
192 icu_util::Initialize(); 192 icu_util::Initialize();
193 193
194 chrome::RegisterPathProvider(); 194 chrome::RegisterPathProvider();
195 app::RegisterPathProvider(); 195 app::RegisterPathProvider();
196 196
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 // See url_request_unittest.cc for these credentials. 496 // See url_request_unittest.cc for these credentials.
497 SupplyProxyCredentials credentials("user", "secret"); 497 SupplyProxyCredentials credentials("user", "secret");
498 watchdog.AddObserver(&credentials, "Windows Security", ""); 498 watchdog.AddObserver(&credentials, "Windows Security", "");
499 testing::InitGoogleTest(&argc, argv); 499 testing::InitGoogleTest(&argc, argv);
500 FilterDisabledTests(); 500 FilterDisabledTests();
501 PluginService::EnableChromePlugins(false); 501 PluginService::EnableChromePlugins(false);
502 CFUrlRequestUnittestRunner test_suite(argc, argv); 502 CFUrlRequestUnittestRunner test_suite(argc, argv);
503 test_suite.RunMainUIThread(); 503 test_suite.RunMainUIThread();
504 return 0; 504 return 0;
505 } 505 }
OLDNEW
« no previous file with comments | « chrome/worker/worker_main.cc ('k') | ui/base/system_monitor/system_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698