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

Side by Side Diff: content/test/content_browser_test_test.cc

Issue 214823006: Move ContentBrowserTest class to content/public, since it's used by components_browsertests for bro… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: remove other files Created 6 years, 9 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 | « content/test/content_browser_test.cc ('k') | content/test/content_browser_test_utils.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) 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 #include "content/test/content_browser_test.h" 5 #include "content/public/test/content_browser_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "content/public/test/content_browser_test_utils.h"
11 #include "content/shell/browser/shell.h" 12 #include "content/shell/browser/shell.h"
12 #include "content/test/content_browser_test_utils.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) { 17 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
18 // Ensures that tests with MANUAL_ prefix don't run automatically. 18 // Ensures that tests with MANUAL_ prefix don't run automatically.
19 ASSERT_TRUE(false); 19 ASSERT_TRUE(false);
20 } 20 }
21 21
22 class ContentBrowserTestSanityTest : public ContentBrowserTest { 22 class ContentBrowserTestSanityTest : public ContentBrowserTest {
(...skipping 18 matching lines...) Expand all
41 41
42 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) { 42 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) {
43 Test(); 43 Test();
44 } 44 }
45 45
46 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, SingleProcess) { 46 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, SingleProcess) {
47 Test(); 47 Test();
48 } 48 }
49 49
50 } // namespace content 50 } // namespace content
OLDNEW
« no previous file with comments | « content/test/content_browser_test.cc ('k') | content/test/content_browser_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698