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

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

Issue 9419033: Move creation of BrowserContext objects that live in content to content, instead of depending on th… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix memory leaks in tests Created 8 years, 10 months 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/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/testing_profile.h » ('j') | 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) 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/public/browser/navigation_controller.h" 16 #include "content/public/browser/navigation_controller.h"
17 #include "content/public/browser/navigation_entry.h" 17 #include "content/public/browser/navigation_entry.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_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; 21 using content::BrowserThread;
22 using content::NavigationController; 22 using content::NavigationController;
23 using content::WebContents; 23 using content::WebContents;
24 24
25 BrowserWithTestWindowTest::BrowserWithTestWindowTest() 25 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
26 : ui_thread_(BrowserThread::UI, message_loop()), 26 : ui_thread_(BrowserThread::UI, message_loop()),
27 file_thread_(BrowserThread::FILE, message_loop()), 27 file_thread_(BrowserThread::FILE, message_loop()),
28 file_user_blocking_thread_(
29 BrowserThread::FILE_USER_BLOCKING, message_loop()),
28 rph_factory_(), 30 rph_factory_(),
29 rvh_factory_(&rph_factory_) { 31 rvh_factory_(&rph_factory_) {
30 #if defined(OS_WIN) 32 #if defined(OS_WIN)
31 OleInitialize(NULL); 33 OleInitialize(NULL);
32 #endif 34 #endif
33 #if defined(USE_AURA) 35 #if defined(USE_AURA)
34 test_activation_client_.reset(new aura::test::TestActivationClient); 36 test_activation_client_.reset(new aura::test::TestActivationClient);
35 #endif 37 #endif
36 } 38 }
37 39
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // Make sure we close all tabs, otherwise Browser isn't happy in its 134 // Make sure we close all tabs, otherwise Browser isn't happy in its
133 // destructor. 135 // destructor.
134 browser()->CloseAllTabs(); 136 browser()->CloseAllTabs();
135 browser_.reset(NULL); 137 browser_.reset(NULL);
136 window_.reset(NULL); 138 window_.reset(NULL);
137 } 139 }
138 140
139 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { 141 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
140 return new TestingProfile(); 142 return new TestingProfile();
141 } 143 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | chrome/test/base/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698