Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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")) |
| 45 .Append(FILE_PATH_LITERAL("test")) | |
| 46 .Append(FILE_PATH_LITERAL("data"))); | |
|
Ryan Sleevi
2012/10/10 17:38:40
You can just use FILE_PATH_LITERAL("content/test/d
Takashi Toyoshima
2012/10/11 03:55:37
Done.
| |
| 45 } | 47 } |
| 46 | 48 |
| 47 ContentBrowserTest::~ContentBrowserTest() { | 49 ContentBrowserTest::~ContentBrowserTest() { |
| 48 } | 50 } |
| 49 | 51 |
| 50 void ContentBrowserTest::SetUp() { | 52 void ContentBrowserTest::SetUp() { |
| 51 shell_main_delegate_.reset(new ShellMainDelegate); | 53 shell_main_delegate_.reset(new ShellMainDelegate); |
| 52 shell_main_delegate_->PreSandboxStartup(); | 54 shell_main_delegate_->PreSandboxStartup(); |
| 53 | 55 |
| 54 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 56 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser()); | 149 static_cast<ShellContentBrowserClient*>(GetContentClient()->browser()); |
| 148 return Shell::CreateNewWindow( | 150 return Shell::CreateNewWindow( |
| 149 browser_client->off_the_record_browser_context(), | 151 browser_client->off_the_record_browser_context(), |
| 150 GURL(chrome::kAboutBlankURL), | 152 GURL(chrome::kAboutBlankURL), |
| 151 NULL, | 153 NULL, |
| 152 MSG_ROUTING_NONE, | 154 MSG_ROUTING_NONE, |
| 153 NULL); | 155 NULL); |
| 154 } | 156 } |
| 155 | 157 |
| 156 } // namespace content | 158 } // namespace content |
| OLD | NEW |