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/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 command_line->AppendSwitch(switches::kEnableFileCookies); | 126 command_line->AppendSwitch(switches::kEnableFileCookies); |
127 | 127 |
128 // Some stuff is hung off of the testing interface which is not enabled | 128 // Some stuff is hung off of the testing interface which is not enabled |
129 // by default. | 129 // by default. |
130 command_line->AppendSwitch(switches::kEnablePepperTesting); | 130 command_line->AppendSwitch(switches::kEnablePepperTesting); |
131 | 131 |
132 // Smooth scrolling confuses the scrollbar test. | 132 // Smooth scrolling confuses the scrollbar test. |
133 command_line->AppendSwitch(switches::kDisableSmoothScrolling); | 133 command_line->AppendSwitch(switches::kDisableSmoothScrolling); |
134 | 134 |
135 // For TestRequestOSFileHandle. | 135 // For TestRequestOSFileHandle. |
136 command_line->AppendSwitchASCII(switches::kAllowRequestOSFileHandleAPI, | 136 command_line->AppendSwitch(switches::kUnlimitedStorage); |
137 "127.0.0.1"); | |
138 } | 137 } |
139 | 138 |
140 void PPAPITestBase::SetUpOnMainThread() { | 139 void PPAPITestBase::SetUpOnMainThread() { |
141 // Always allow access to the PPAPI broker. | 140 // Always allow access to the PPAPI broker. |
142 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( | 141 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
143 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, CONTENT_SETTING_ALLOW); | 142 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, CONTENT_SETTING_ALLOW); |
144 } | 143 } |
145 | 144 |
146 GURL PPAPITestBase::GetTestFileUrl(const std::string& test_case) { | 145 GURL PPAPITestBase::GetTestFileUrl(const std::string& test_case) { |
147 base::FilePath test_path; | 146 base::FilePath test_path; |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 const std::string& base, | 368 const std::string& base, |
370 const std::string& test_case) { | 369 const std::string& test_case) { |
371 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 370 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
372 test_case.c_str()); | 371 test_case.c_str()); |
373 } | 372 } |
374 | 373 |
375 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 374 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
376 // The default content setting for the PPAPI broker is ASK. We purposefully | 375 // The default content setting for the PPAPI broker is ASK. We purposefully |
377 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 376 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
378 } | 377 } |
OLD | NEW |