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

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

Issue 343013: With the change in the constructor for the ChromeThread class, we are seeing ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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_frame/com_type_info_holder.cc ('k') | no next file » | 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) 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 } 139 }
140 140
141 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) 141 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
142 : NetTestSuite(argc, argv), 142 : NetTestSuite(argc, argv),
143 chrome_frame_html_("/chrome_frame", kChromeFrameHtml) { 143 chrome_frame_html_("/chrome_frame", kChromeFrameHtml) {
144 fake_chrome_.Initialize(); 144 fake_chrome_.Initialize();
145 pss_subclass_.reset(new ProcessSingletonSubclass(this)); 145 pss_subclass_.reset(new ProcessSingletonSubclass(this));
146 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data())); 146 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
147 StartChromeFrameInHostBrowser(); 147 StartChromeFrameInHostBrowser();
148 // Register the main thread by instantiating it, but don't call any methods. 148 // Register the main thread by instantiating it, but don't call any methods.
149 main_thread_.reset(new ChromeThread(ChromeThread::UI)); 149 main_thread_.reset(new ChromeThread(ChromeThread::UI,
150 MessageLoop::current()));
150 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); 151 DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
151 } 152 }
152 153
153 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() { 154 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() {
154 fake_chrome_.Shutdown(); 155 fake_chrome_.Shutdown();
155 } 156 }
156 157
157 DWORD WINAPI NavigateIE(void* param) { 158 DWORD WINAPI NavigateIE(void* param) {
158 return 0; 159 return 0;
159 win_util::ScopedCOMInitializer com; 160 win_util::ScopedCOMInitializer com;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 DialogWatchdog watchdog; 381 DialogWatchdog watchdog;
381 // See url_request_unittest.cc for these credentials. 382 // See url_request_unittest.cc for these credentials.
382 SupplyProxyCredentials credentials("user", "secret"); 383 SupplyProxyCredentials credentials("user", "secret");
383 watchdog.AddObserver(&credentials); 384 watchdog.AddObserver(&credentials);
384 testing::InitGoogleTest(&argc, argv); 385 testing::InitGoogleTest(&argc, argv);
385 FilterDisabledTests(); 386 FilterDisabledTests();
386 CFUrlRequestUnittestRunner test_suite(argc, argv); 387 CFUrlRequestUnittestRunner test_suite(argc, argv);
387 test_suite.RunMainUIThread(); 388 test_suite.RunMainUIThread();
388 return 0; 389 return 0;
389 } 390 }
OLDNEW
« no previous file with comments | « chrome_frame/com_type_info_holder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698