OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <exdisp.h> | 7 #include <exdisp.h> |
8 | 8 |
9 #include "app/app_paths.h" | 9 #include "app/app_paths.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 } | 138 } |
139 | 139 |
140 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) | 140 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) |
141 : NetTestSuite(argc, argv), | 141 : NetTestSuite(argc, argv), |
142 chrome_frame_html_("/chrome_frame", kChromeFrameHtml) { | 142 chrome_frame_html_("/chrome_frame", kChromeFrameHtml) { |
143 fake_chrome_.Initialize(); | 143 fake_chrome_.Initialize(); |
144 pss_subclass_.reset(new ProcessSingletonSubclass(this)); | 144 pss_subclass_.reset(new ProcessSingletonSubclass(this)); |
145 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data())); | 145 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data())); |
146 StartChromeFrameInHostBrowser(); | 146 StartChromeFrameInHostBrowser(); |
147 // Register the main thread by instantiating it, but don't call any methods. | 147 // Register the main thread by instantiating it, but don't call any methods. |
148 main_thread_.reset(new ChromeThread()); | 148 main_thread_.reset(new ChromeThread(ChromeThread::UI)); |
149 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); | 149 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); |
150 } | 150 } |
151 | 151 |
152 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() { | 152 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() { |
153 fake_chrome_.Shutdown(); | 153 fake_chrome_.Shutdown(); |
154 } | 154 } |
155 | 155 |
156 DWORD WINAPI NavigateIE(void* param) { | 156 DWORD WINAPI NavigateIE(void* param) { |
157 return 0; | 157 return 0; |
158 win_util::ScopedCOMInitializer com; | 158 win_util::ScopedCOMInitializer com; |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 DialogWatchdog watchdog; | 379 DialogWatchdog watchdog; |
380 // See url_request_unittest.cc for these credentials. | 380 // See url_request_unittest.cc for these credentials. |
381 SupplyProxyCredentials credentials("user", "secret"); | 381 SupplyProxyCredentials credentials("user", "secret"); |
382 watchdog.AddObserver(&credentials); | 382 watchdog.AddObserver(&credentials); |
383 testing::InitGoogleTest(&argc, argv); | 383 testing::InitGoogleTest(&argc, argv); |
384 FilterDisabledTests(); | 384 FilterDisabledTests(); |
385 CFUrlRequestUnittestRunner test_suite(argc, argv); | 385 CFUrlRequestUnittestRunner test_suite(argc, argv); |
386 test_suite.RunMainUIThread(); | 386 test_suite.RunMainUIThread(); |
387 return 0; | 387 return 0; |
388 } | 388 } |
OLD | NEW |