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

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

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. Created 7 years, 5 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/ui_test_utils.cc ('k') | chrome/test/base/view_event_test_base.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_VIEW_EVENT_TEST_BASE_H_ 5 #ifndef CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
6 #define CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_ 6 #define CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
7 7
8 // We only want to use ViewEventTestBase in test targets which properly 8 // We only want to use ViewEventTestBase in test targets which properly
9 // isolate each test case by running each test in a separate process. 9 // isolate each test case by running each test in a separate process.
10 // This way if a test hangs the test launcher can reliably terminate it. 10 // This way if a test hangs the test launcher can reliably terminate it.
11 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER) 11 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "content/public/test/test_browser_thread.h" 18 #include "content/public/test/test_browser_thread_bundle.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 #include "ui/views/widget/widget_delegate.h" 20 #include "ui/views/widget/widget_delegate.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "ui/base/win/scoped_ole_initializer.h" 23 #include "ui/base/win/scoped_ole_initializer.h"
24 #endif 24 #endif
25 25
26 namespace aura { 26 namespace aura {
27 namespace test { 27 namespace test {
28 class AuraTestHelper; 28 class AuraTestHelper;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // Callback from CreateEventTask. Stops the background thread, runs the 134 // Callback from CreateEventTask. Stops the background thread, runs the
135 // supplied task and if there are failures invokes Done. 135 // supplied task and if there are failures invokes Done.
136 void RunTestMethod(const base::Closure& task); 136 void RunTestMethod(const base::Closure& task);
137 137
138 // The content of the Window. 138 // The content of the Window.
139 views::View* content_view_; 139 views::View* content_view_;
140 140
141 // Thread for posting background MouseMoves. 141 // Thread for posting background MouseMoves.
142 scoped_ptr<base::Thread> dnd_thread_; 142 scoped_ptr<base::Thread> dnd_thread_;
143 143
144 base::MessageLoopForUI message_loop_; 144 content::TestBrowserThreadBundle thread_bundle_;
145
146 content::TestBrowserThread ui_thread_;
147 145
148 #if defined(OS_WIN) 146 #if defined(OS_WIN)
149 ui::ScopedOleInitializer ole_initializer_; 147 ui::ScopedOleInitializer ole_initializer_;
150 #endif 148 #endif
151 149
152 #if defined(USE_AURA) 150 #if defined(USE_AURA)
153 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; 151 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
154 #endif 152 #endif
155 153
156 DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase); 154 DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase);
157 }; 155 };
158 156
159 // Convenience macro for defining a ViewEventTestBase. See class description 157 // Convenience macro for defining a ViewEventTestBase. See class description
160 // of ViewEventTestBase for details. 158 // of ViewEventTestBase for details.
161 #define VIEW_TEST(test_class, name) \ 159 #define VIEW_TEST(test_class, name) \
162 TEST_F(test_class, name) {\ 160 TEST_F(test_class, name) {\
163 StartMessageLoopAndRunTest();\ 161 StartMessageLoopAndRunTest();\
164 } 162 }
165 163
166 #endif // defined(HAS_OUT_OF_PROC_TEST_RUNNER) 164 #endif // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
167 165
168 #endif // CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_ 166 #endif // CHROME_TEST_BASE_VIEW_EVENT_TEST_BASE_H_
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698