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/files/file_path.h" | 8 #include "base/files/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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 subprocess_path = subprocess_path.DirName().DirName(); | 75 subprocess_path = subprocess_path.DirName().DirName(); |
76 DCHECK_EQ(subprocess_path.BaseName().value(), "Contents"); | 76 DCHECK_EQ(subprocess_path.BaseName().value(), "Contents"); |
77 subprocess_path = subprocess_path.Append( | 77 subprocess_path = subprocess_path.Append( |
78 "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper")
; | 78 "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper")
; |
79 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath, | 79 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath, |
80 subprocess_path); | 80 subprocess_path); |
81 #endif | 81 #endif |
82 | 82 |
83 // NOTE: should be kept in sync with | 83 // NOTE: should be kept in sync with |
84 // chrome/browser/resources/software_rendering_list.json | 84 // chrome/browser/resources/software_rendering_list.json |
85 #if !defined(OS_WIN) && !defined(OS_CHROMEOS) | 85 #if !defined(OS_WIN) && !defined(OS_CHROMEOS) !defined(OS_LINUX) |
86 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 86 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
87 #endif | 87 #endif |
88 | 88 |
89 BrowserTestBase::SetUp(); | 89 BrowserTestBase::SetUp(); |
90 } | 90 } |
91 | 91 |
92 void ContentBrowserTest::TearDown() { | 92 void ContentBrowserTest::TearDown() { |
93 BrowserTestBase::TearDown(); | 93 BrowserTestBase::TearDown(); |
94 | 94 |
95 shell_main_delegate_.reset(); | 95 shell_main_delegate_.reset(); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { | 146 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { |
147 return Shell::CreateNewWindow( | 147 return Shell::CreateNewWindow( |
148 ShellContentBrowserClient::Get()->off_the_record_browser_context(), | 148 ShellContentBrowserClient::Get()->off_the_record_browser_context(), |
149 GURL(kAboutBlankURL), | 149 GURL(kAboutBlankURL), |
150 NULL, | 150 NULL, |
151 MSG_ROUTING_NONE, | 151 MSG_ROUTING_NONE, |
152 gfx::Size()); | 152 gfx::Size()); |
153 } | 153 } |
154 | 154 |
155 } // namespace content | 155 } // namespace content |
OLD | NEW |