| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 | 125 |
| 126 PPAPITestBase::PPAPITestBase() { | 126 PPAPITestBase::PPAPITestBase() { |
| 127 } | 127 } |
| 128 | 128 |
| 129 void PPAPITestBase::SetUp() { | 129 void PPAPITestBase::SetUp() { |
| 130 EnablePixelOutput(); | 130 EnablePixelOutput(); |
| 131 InProcessBrowserTest::SetUp(); | 131 InProcessBrowserTest::SetUp(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) { | 134 void PPAPITestBase::SetUpCommandLine(base::CommandLine* command_line) { |
| 135 // The test sends us the result via a cookie. | |
| 136 command_line->AppendSwitch(switches::kEnableFileCookies); | |
| 137 | |
| 138 // Some stuff is hung off of the testing interface which is not enabled | 135 // Some stuff is hung off of the testing interface which is not enabled |
| 139 // by default. | 136 // by default. |
| 140 command_line->AppendSwitch(switches::kEnablePepperTesting); | 137 command_line->AppendSwitch(switches::kEnablePepperTesting); |
| 141 | 138 |
| 142 // Smooth scrolling confuses the scrollbar test. | 139 // Smooth scrolling confuses the scrollbar test. |
| 143 command_line->AppendSwitch(switches::kDisableSmoothScrolling); | 140 command_line->AppendSwitch(switches::kDisableSmoothScrolling); |
| 144 } | 141 } |
| 145 | 142 |
| 146 void PPAPITestBase::SetUpOnMainThread() { | 143 void PPAPITestBase::SetUpOnMainThread() { |
| 147 // Always allow access to the PPAPI broker. | 144 // Always allow access to the PPAPI broker. |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 const std::string& base, | 477 const std::string& base, |
| 481 const std::string& test_case) { | 478 const std::string& test_case) { |
| 482 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 479 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
| 483 test_case.c_str()); | 480 test_case.c_str()); |
| 484 } | 481 } |
| 485 | 482 |
| 486 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 483 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
| 487 // The default content setting for the PPAPI broker is ASK. We purposefully | 484 // The default content setting for the PPAPI broker is ASK. We purposefully |
| 488 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 485 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
| 489 } | 486 } |
| OLD | NEW |