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

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

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/test/automation/proxy_launcher.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) 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/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "base/scoped_temp_dir.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 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "chrome/browser/chromeos/cros/cros_library.h" 18 #include "chrome/browser/chromeos/cros/cros_library.h"
19 #endif // defined(OS_CHROMEOS) 19 #endif // defined(OS_CHROMEOS)
20 20
21 #if defined(OS_MACOSX) 21 #if defined(OS_MACOSX)
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 Browser* browser_; 189 Browser* browser_;
190 190
191 // ContentRendererClient when running in single-process mode. 191 // ContentRendererClient when running in single-process mode.
192 scoped_ptr<content::ContentRendererClient> single_process_renderer_client_; 192 scoped_ptr<content::ContentRendererClient> single_process_renderer_client_;
193 193
194 // Host resolver to use during the test. 194 // Host resolver to use during the test.
195 scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_; 195 scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_;
196 196
197 // Temporary user data directory. Used only when a user data directory is not 197 // Temporary user data directory. Used only when a user data directory is not
198 // specified in the command line. 198 // specified in the command line.
199 ScopedTempDir temp_user_data_dir_; 199 base::ScopedTempDir temp_user_data_dir_;
200 200
201 #if defined(OS_CHROMEOS) 201 #if defined(OS_CHROMEOS)
202 chromeos::ScopedStubCrosEnabler stub_cros_enabler_; 202 chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
203 #endif // defined(OS_CHROMEOS) 203 #endif // defined(OS_CHROMEOS)
204 204
205 #if defined(OS_MACOSX) 205 #if defined(OS_MACOSX)
206 base::mac::ScopedNSAutoreleasePool* autorelease_pool_; 206 base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
207 #endif // OS_MACOSX 207 #endif // OS_MACOSX
208 }; 208 };
209 209
210 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 210 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/automation/proxy_launcher.h ('k') | chrome/test/base/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698