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

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

Issue 10185008: Taking over issue 10006037: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/chrome_browser.gypi ('k') | chrome/test/base/browser_with_test_window_test.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 // the destructor. 106 // the destructor.
107 void DestroyBrowser(); 107 void DestroyBrowser();
108 108
109 // Creates the profile used by this test. The caller owners the return value. 109 // Creates the profile used by this test. The caller owners the return value.
110 virtual TestingProfile* CreateProfile(); 110 virtual TestingProfile* CreateProfile();
111 111
112 private: 112 private:
113 // We need to create a MessageLoop, otherwise a bunch of things fails. 113 // We need to create a MessageLoop, otherwise a bunch of things fails.
114 MessageLoopForUI ui_loop_; 114 MessageLoopForUI ui_loop_;
115 content::TestBrowserThread ui_thread_; 115 content::TestBrowserThread ui_thread_;
116 content::TestBrowserThread db_thread_;
116 content::TestBrowserThread file_thread_; 117 content::TestBrowserThread file_thread_;
117 content::TestBrowserThread file_user_blocking_thread_; 118 content::TestBrowserThread file_user_blocking_thread_;
118 119
119 scoped_ptr<TestingProfile> profile_; 120 scoped_ptr<TestingProfile> profile_;
120 scoped_ptr<TestBrowserWindow> window_; 121 scoped_ptr<TestBrowserWindow> window_;
121 scoped_ptr<Browser> browser_; 122 scoped_ptr<Browser> browser_;
122 123
123 // The existence of this object enables tests via 124 // The existence of this object enables tests via
124 // RenderViewHostTester. 125 // RenderViewHostTester.
125 content::RenderViewHostTestEnabler rvh_test_enabler_; 126 content::RenderViewHostTestEnabler rvh_test_enabler_;
126 127
127 #if defined(USE_AURA) 128 #if defined(USE_AURA)
128 scoped_ptr<aura::RootWindow> root_window_; 129 scoped_ptr<aura::RootWindow> root_window_;
129 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 130 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
130 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_; 131 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
131 #endif 132 #endif
132 133
133 #if defined(OS_WIN) 134 #if defined(OS_WIN)
134 ui::ScopedOleInitializer ole_initializer_; 135 ui::ScopedOleInitializer ole_initializer_;
135 #endif 136 #endif
136 137
137 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); 138 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
138 }; 139 };
139 140
140 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 141 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/base/browser_with_test_window_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698