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

Side by Side Diff: chrome/test/base/browser_with_test_window_test.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. 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/test/base/browser_with_test_window_test.h" 5 #include "chrome/test/base/browser_with_test_window_test.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <ole2.h> 8 #include <ole2.h>
9 #endif // defined(OS_WIN) 9 #endif // defined(OS_WIN)
10 10
11 #include "chrome/browser/tabs/tab_strip_model.h" 11 #include "chrome/browser/tabs/tab_strip_model.h"
12 #include "chrome/browser/ui/browser_navigator.h" 12 #include "chrome/browser/ui/browser_navigator.h"
13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 13 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
14 #include "chrome/common/render_messages.h" 14 #include "chrome/common/render_messages.h"
15 #include "chrome/test/base/testing_profile.h" 15 #include "chrome/test/base/testing_profile.h"
16 #include "content/browser/tab_contents/navigation_controller.h" 16 #include "content/browser/tab_contents/navigation_controller.h"
17 #include "content/browser/tab_contents/navigation_entry.h" 17 #include "content/browser/tab_contents/navigation_entry.h"
18 #include "content/browser/tab_contents/tab_contents.h" 18 #include "content/browser/tab_contents/tab_contents.h"
19 #include "content/public/common/page_transition_types.h" 19 #include "content/public/common/page_transition_types.h"
20 20
21 using content::BrowserThread;
22
21 BrowserWithTestWindowTest::BrowserWithTestWindowTest() 23 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
22 : ui_thread_(BrowserThread::UI, message_loop()), 24 : ui_thread_(BrowserThread::UI, message_loop()),
23 file_thread_(BrowserThread::FILE, message_loop()), 25 file_thread_(BrowserThread::FILE, message_loop()),
24 rph_factory_(), 26 rph_factory_(),
25 rvh_factory_(&rph_factory_) { 27 rvh_factory_(&rph_factory_) {
26 #if defined(OS_WIN) 28 #if defined(OS_WIN)
27 OleInitialize(NULL); 29 OleInitialize(NULL);
28 #endif 30 #endif
29 } 31 }
30 32
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // Make sure we close all tabs, otherwise Browser isn't happy in its 130 // Make sure we close all tabs, otherwise Browser isn't happy in its
129 // destructor. 131 // destructor.
130 browser()->CloseAllTabs(); 132 browser()->CloseAllTabs();
131 browser_.reset(NULL); 133 browser_.reset(NULL);
132 window_.reset(NULL); 134 window_.reset(NULL);
133 } 135 }
134 136
135 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { 137 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
136 return new TestingProfile(); 138 return new TestingProfile();
137 } 139 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/web_database_migration_unittest.cc ('k') | chrome/test/base/test_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698