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

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

Issue 10825311: Add a MANUAL_ prefix for browser tests. These tests don't run unless --run-manual is specified. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
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/test/content_browser_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
13 #include "content/public/common/content_switches.h" 13 #include "content/public/common/content_switches.h"
14 #include "content/public/common/url_constants.h" 14 #include "content/public/common/url_constants.h"
15 #include "content/shell/shell.h" 15 #include "content/shell/shell.h"
16 #include "content/shell/shell_browser_context.h" 16 #include "content/shell/shell_browser_context.h"
17 #include "content/shell/shell_content_browser_client.h" 17 #include "content/shell/shell_content_browser_client.h"
18 #include "content/shell/shell_content_renderer_client.h" 18 #include "content/shell/shell_content_renderer_client.h"
19 #include "content/shell/shell_main_delegate.h" 19 #include "content/shell/shell_main_delegate.h"
20 #include "content/shell/shell_switches.h" 20 #include "content/shell/shell_switches.h"
21 #include "content/test/test_content_client.h" 21 #include "content/test/test_content_client.h"
22 22
23 #if defined(OS_MACOSX) 23 #if defined(OS_MACOSX)
24 #include "base/mac/scoped_nsautorelease_pool.h" 24 #include "base/mac/scoped_nsautorelease_pool.h"
25 #endif 25 #endif
26 26
27 namespace content { 27 namespace content {
28 28
29 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
30 // Ensures that tests with MANUAL_ prefix don't run automatically.
31 ASSERT_TRUE(false);
32 }
33
29 ContentBrowserTest::ContentBrowserTest() { 34 ContentBrowserTest::ContentBrowserTest() {
30 #if defined(OS_MACOSX) 35 #if defined(OS_MACOSX)
31 // See comment in InProcessBrowserTest::InProcessBrowserTest(). 36 // See comment in InProcessBrowserTest::InProcessBrowserTest().
32 FilePath content_shell_path; 37 FilePath content_shell_path;
33 CHECK(PathService::Get(base::FILE_EXE, &content_shell_path)); 38 CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
34 content_shell_path = content_shell_path.DirName(); 39 content_shell_path = content_shell_path.DirName();
35 content_shell_path = content_shell_path.Append( 40 content_shell_path = content_shell_path.Append(
36 FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell")); 41 FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
37 CHECK(PathService::Override(base::FILE_EXE, content_shell_path)); 42 CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
38 #endif 43 #endif
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser()); 139 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
135 return Shell::CreateNewWindow( 140 return Shell::CreateNewWindow(
136 browser_client->off_the_record_browser_context(), 141 browser_client->off_the_record_browser_context(),
137 GURL(chrome::kAboutBlankURL), 142 GURL(chrome::kAboutBlankURL),
138 NULL, 143 NULL,
139 MSG_ROUTING_NONE, 144 MSG_ROUTING_NONE,
140 NULL); 145 NULL);
141 } 146 }
142 147
143 } // namespace content 148 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698