OLD | NEW |
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 FakeExternalTab::~FakeExternalTab() { | 180 FakeExternalTab::~FakeExternalTab() { |
181 if (!overridden_user_dir_.empty()) { | 181 if (!overridden_user_dir_.empty()) { |
182 PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_); | 182 PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_); |
183 } | 183 } |
184 } | 184 } |
185 | 185 |
186 void FakeExternalTab::Initialize() { | 186 void FakeExternalTab::Initialize() { |
187 DCHECK(g_browser_process == NULL); | 187 DCHECK(g_browser_process == NULL); |
188 ui::SystemMonitor system_monitor; | 188 ui::SystemMonitor system_monitor; |
189 | 189 |
190 // The gears plugin causes the PluginRequestInterceptor to kick in and it | |
191 // will cause problems when it tries to intercept URL requests. | |
192 PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath()); | |
193 | |
194 icu_util::Initialize(); | 190 icu_util::Initialize(); |
195 | 191 |
196 app::RegisterPathProvider(); | 192 app::RegisterPathProvider(); |
197 content::RegisterPathProvider(); | 193 content::RegisterPathProvider(); |
198 ui::RegisterPathProvider(); | 194 ui::RegisterPathProvider(); |
199 | 195 |
200 // Load Chrome.dll as our resource dll. | 196 // Load Chrome.dll as our resource dll. |
201 FilePath dll; | 197 FilePath dll; |
202 PathService::Get(base::DIR_MODULE, &dll); | 198 PathService::Get(base::DIR_MODULE, &dll); |
203 dll = dll.Append(chrome::kBrowserResourcesDll); | 199 dll = dll.Append(chrome::kBrowserResourcesDll); |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 // the instance of the AtExitManager that RegisterPathProvider() and others | 507 // the instance of the AtExitManager that RegisterPathProvider() and others |
512 // below require. So we have to instantiate this first. | 508 // below require. So we have to instantiate this first. |
513 CFUrlRequestUnittestRunner test_suite(argc, argv); | 509 CFUrlRequestUnittestRunner test_suite(argc, argv); |
514 | 510 |
515 WindowWatchdog watchdog; | 511 WindowWatchdog watchdog; |
516 // See url_request_unittest.cc for these credentials. | 512 // See url_request_unittest.cc for these credentials. |
517 SupplyProxyCredentials credentials("user", "secret"); | 513 SupplyProxyCredentials credentials("user", "secret"); |
518 watchdog.AddObserver(&credentials, "Windows Security", ""); | 514 watchdog.AddObserver(&credentials, "Windows Security", ""); |
519 testing::InitGoogleTest(&argc, argv); | 515 testing::InitGoogleTest(&argc, argv); |
520 FilterDisabledTests(); | 516 FilterDisabledTests(); |
521 PluginService::EnableChromePlugins(false); | |
522 test_suite.RunMainUIThread(); | 517 test_suite.RunMainUIThread(); |
523 return 0; | 518 return 0; |
524 } | 519 } |
OLD | NEW |