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

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

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 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/chrome_test_launcher.cc ('k') | chrome/test/base/in_process_browser_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_IN_PROCESS_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "content/public/common/page_transition_types.h" 12 #include "content/public/common/page_transition_types.h"
13 #include "content/public/test/browser_test.h" 13 #include "content/public/test/browser_test.h"
14 #include "content/public/test/browser_test_base.h" 14 #include "content/public/test/browser_test_base.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace base { 17 namespace base {
18 #if defined(OS_MACOSX) 18 #if defined(OS_MACOSX)
19 namespace mac { 19 namespace mac {
20 class ScopedNSAutoreleasePool; 20 class ScopedNSAutoreleasePool;
21 } // namespace mac 21 } // namespace mac
22 #endif // defined(OS_MACOSX) 22 #endif // defined(OS_MACOSX)
23 23
24 #if defined(OS_WIN) && defined(USE_AURA) 24 #if defined(OS_WIN)
25 namespace win { 25 namespace win {
26 class ScopedCOMInitializer; 26 class ScopedCOMInitializer;
27 } 27 }
28 #endif // defined(OS_WIN) && defined(USE_AURA) 28 #endif // defined(OS_WIN)
29 } // namespace base 29 } // namespace base
30 30
31 class Browser; 31 class Browser;
32 class CommandLine; 32 class CommandLine;
33 class Profile; 33 class Profile;
34 34
35 namespace content { 35 namespace content {
36 class ContentRendererClient; 36 class ContentRendererClient;
37 } 37 }
38 38
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 bool exit_when_last_browser_closes_; 197 bool exit_when_last_browser_closes_;
198 198
199 // True if this is a multi-desktop test (in which case this browser test will 199 // True if this is a multi-desktop test (in which case this browser test will
200 // not ensure that Browsers are only created on the tested desktop). 200 // not ensure that Browsers are only created on the tested desktop).
201 bool multi_desktop_test_; 201 bool multi_desktop_test_;
202 202
203 #if defined(OS_MACOSX) 203 #if defined(OS_MACOSX)
204 base::mac::ScopedNSAutoreleasePool* autorelease_pool_; 204 base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
205 #endif // OS_MACOSX 205 #endif // OS_MACOSX
206 206
207 #if defined(OS_WIN) && defined(USE_AURA) 207 #if defined(OS_WIN)
208 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; 208 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
209 #endif 209 #endif
210 }; 210 };
211 211
212 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 212 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_test_launcher.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698