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

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

Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unknwn Created 9 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/test/automation/proxy_launcher.h ('k') | chrome/test/out_of_proc_test_runner.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) 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 #ifndef CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
6 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 6 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.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 "base/memory/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
13 #include "content/common/page_transition_types.h" 13 #include "content/common/page_transition_types.h"
14 #include "net/test/test_server.h" 14 #include "net/test/test_server.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 class Browser; 21 class Browser;
22 class CommandLine; 22 class CommandLine;
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ 251 GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
252 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread() 252 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
253 253
254 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\ 254 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
255 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\ 255 IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
256 ::testing::internal::GetTypeId<test_fixture>()) 256 ::testing::internal::GetTypeId<test_fixture>())
257 257
258 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST) 258 #endif // defined(ALLOW_IN_PROC_BROWSER_TEST)
259 259
260 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_ 260 #endif // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/automation/proxy_launcher.h ('k') | chrome/test/out_of_proc_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698