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

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

Issue 11094040: BrowserTestBase::CreateTestServer should accept FilePath (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mod nits Created 8 years, 2 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/public/test/browser_test_base.cc ('k') | no next file » | 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/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"
(...skipping 23 matching lines...) Expand all
34 ContentBrowserTest::ContentBrowserTest() { 34 ContentBrowserTest::ContentBrowserTest() {
35 #if defined(OS_MACOSX) 35 #if defined(OS_MACOSX)
36 // See comment in InProcessBrowserTest::InProcessBrowserTest(). 36 // See comment in InProcessBrowserTest::InProcessBrowserTest().
37 FilePath content_shell_path; 37 FilePath content_shell_path;
38 CHECK(PathService::Get(base::FILE_EXE, &content_shell_path)); 38 CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
39 content_shell_path = content_shell_path.DirName(); 39 content_shell_path = content_shell_path.DirName();
40 content_shell_path = content_shell_path.Append( 40 content_shell_path = content_shell_path.Append(
41 FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell")); 41 FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
42 CHECK(PathService::Override(base::FILE_EXE, content_shell_path)); 42 CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
43 #endif 43 #endif
44 CreateTestServer("content/test/data"); 44 CreateTestServer(FilePath(FILE_PATH_LITERAL("content/test/data")));
45 } 45 }
46 46
47 ContentBrowserTest::~ContentBrowserTest() { 47 ContentBrowserTest::~ContentBrowserTest() {
48 } 48 }
49 49
50 void ContentBrowserTest::SetUp() { 50 void ContentBrowserTest::SetUp() {
51 shell_main_delegate_.reset(new ShellMainDelegate); 51 shell_main_delegate_.reset(new ShellMainDelegate);
52 shell_main_delegate_->PreSandboxStartup(); 52 shell_main_delegate_->PreSandboxStartup();
53 53
54 CommandLine* command_line = CommandLine::ForCurrentProcess(); 54 CommandLine* command_line = CommandLine::ForCurrentProcess();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser()); 147 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser());
148 return Shell::CreateNewWindow( 148 return Shell::CreateNewWindow(
149 browser_client->off_the_record_browser_context(), 149 browser_client->off_the_record_browser_context(),
150 GURL(chrome::kAboutBlankURL), 150 GURL(chrome::kAboutBlankURL),
151 NULL, 151 NULL,
152 MSG_ROUTING_NONE, 152 MSG_ROUTING_NONE,
153 NULL); 153 NULL);
154 } 154 }
155 155
156 } // namespace content 156 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698