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

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Introduce and use BrowserThreadDelegate, BMP::Pre/PostStartThread, to make this a safe refactoring. Created 9 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
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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 300
301 ResourceBundle::CleanupSharedInstance(); 301 ResourceBundle::CleanupSharedInstance();
302 } 302 }
303 303
304 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) 304 CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
305 : NetTestSuite(argc, argv), 305 : NetTestSuite(argc, argv),
306 chrome_frame_html_("/chrome_frame", kChromeFrameHtml), 306 chrome_frame_html_("/chrome_frame", kChromeFrameHtml),
307 registrar_(chrome_frame_test::GetTestBedType()), 307 registrar_(chrome_frame_test::GetTestBedType()),
308 test_result_(0) { 308 test_result_(0) {
309 // Register the main thread by instantiating it, but don't call any methods. 309 // Register the main thread by instantiating it, but don't call any methods.
310 main_thread_.reset(new content::DeprecatedBrowserThread( 310 main_thread_.reset(new content::TestBrowserThread(
311 BrowserThread::UI, MessageLoop::current())); 311 BrowserThread::UI, MessageLoop::current()));
312 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 312 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
313 fake_chrome_.Initialize(); 313 fake_chrome_.Initialize();
314 pss_subclass_.reset(new ProcessSingletonSubclass(this)); 314 pss_subclass_.reset(new ProcessSingletonSubclass(this));
315 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data())); 315 EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
316 StartChromeFrameInHostBrowser(); 316 StartChromeFrameInHostBrowser();
317 } 317 }
318 318
319 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() { 319 CFUrlRequestUnittestRunner::~CFUrlRequestUnittestRunner() {
320 fake_chrome_.Shutdown(); 320 fake_chrome_.Shutdown();
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); 618 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
619 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); 619 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
620 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which 620 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
621 // check if globals are created and destroyed on the same thread don't fire. 621 // check if globals are created and destroyed on the same thread don't fire.
622 // Webkit global objects are created on the inproc renderer thread. 622 // Webkit global objects are created on the inproc renderer thread.
623 #if !defined(NDEBUG) 623 #if !defined(NDEBUG)
624 ExitProcess(test_suite.test_result()); 624 ExitProcess(test_suite.test_result());
625 #endif // NDEBUG 625 #endif // NDEBUG
626 return test_suite.test_result(); 626 return test_suite.test_result();
627 } 627 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698