| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ppapi/ppapi_test.h" | 5 #include "content/test/ppapi/ppapi_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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 } | 37 } |
| 38 | 38 |
| 39 void PPAPITestMessageHandler::Reset() { | 39 void PPAPITestMessageHandler::Reset() { |
| 40 TestMessageHandler::Reset(); | 40 TestMessageHandler::Reset(); |
| 41 message_.clear(); | 41 message_.clear(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 PPAPITestBase::PPAPITestBase() { } | 44 PPAPITestBase::PPAPITestBase() { } |
| 45 | 45 |
| 46 void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) { | 46 void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) { |
| 47 // The test sends us the result via a cookie. | |
| 48 command_line->AppendSwitch(switches::kEnableFileCookies); | |
| 49 | |
| 50 // Some stuff is hung off of the testing interface which is not enabled | 47 // Some stuff is hung off of the testing interface which is not enabled |
| 51 // by default. | 48 // by default. |
| 52 command_line->AppendSwitch(switches::kEnablePepperTesting); | 49 command_line->AppendSwitch(switches::kEnablePepperTesting); |
| 53 | 50 |
| 54 // Smooth scrolling confuses the scrollbar test. | 51 // Smooth scrolling confuses the scrollbar test. |
| 55 command_line->AppendSwitch(switches::kDisableSmoothScrolling); | 52 command_line->AppendSwitch(switches::kDisableSmoothScrolling); |
| 56 | 53 |
| 57 // Allow manual garbage collection. | 54 // Allow manual garbage collection. |
| 58 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); | 55 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); |
| 59 } | 56 } |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 } | 138 } |
| 142 | 139 |
| 143 void OutOfProcessPPAPITest::TearDown() { | 140 void OutOfProcessPPAPITest::TearDown() { |
| 144 ContentBrowserTest::TearDown(); | 141 ContentBrowserTest::TearDown(); |
| 145 #if defined(OS_CHROMEOS) | 142 #if defined(OS_CHROMEOS) |
| 146 chromeos::CrasAudioHandler::Shutdown(); | 143 chromeos::CrasAudioHandler::Shutdown(); |
| 147 #endif | 144 #endif |
| 148 } | 145 } |
| 149 | 146 |
| 150 } // namespace content | 147 } // namespace content |
| OLD | NEW |