| 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/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 void ExtensionApiTest::TearDownInProcessBrowserTestFixture() { | 168 void ExtensionApiTest::TearDownInProcessBrowserTestFixture() { |
| 169 extensions::TestGetConfigFunction::set_test_config_state(NULL); | 169 extensions::TestGetConfigFunction::set_test_config_state(NULL); |
| 170 test_config_.reset(NULL); | 170 test_config_.reset(NULL); |
| 171 } | 171 } |
| 172 | 172 |
| 173 bool ExtensionApiTest::RunExtensionTest(const std::string& extension_name) { | 173 bool ExtensionApiTest::RunExtensionTest(const std::string& extension_name) { |
| 174 return RunExtensionTestImpl( | 174 return RunExtensionTestImpl( |
| 175 extension_name, std::string(), NULL, kFlagEnableFileAccess); | 175 extension_name, std::string(), NULL, kFlagEnableFileAccess); |
| 176 } | 176 } |
| 177 | 177 |
| 178 bool ExtensionApiTest::RunExtensionTestWithArg( |
| 179 const std::string& extension_name, |
| 180 const char* custom_arg) { |
| 181 return RunExtensionTestImpl(extension_name, std::string(), custom_arg, |
| 182 kFlagEnableFileAccess); |
| 183 } |
| 184 |
| 178 bool ExtensionApiTest::RunExtensionTestIncognito( | 185 bool ExtensionApiTest::RunExtensionTestIncognito( |
| 179 const std::string& extension_name) { | 186 const std::string& extension_name) { |
| 180 return RunExtensionTestImpl(extension_name, | 187 return RunExtensionTestImpl(extension_name, |
| 181 std::string(), | 188 std::string(), |
| 182 NULL, | 189 NULL, |
| 183 kFlagEnableIncognito | kFlagEnableFileAccess); | 190 kFlagEnableIncognito | kFlagEnableFileAccess); |
| 184 } | 191 } |
| 185 | 192 |
| 186 bool ExtensionApiTest::RunExtensionTestIgnoreManifestWarnings( | 193 bool ExtensionApiTest::RunExtensionTestIgnoreManifestWarnings( |
| 187 const std::string& extension_name) { | 194 const std::string& extension_name) { |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 } | 426 } |
| 420 | 427 |
| 421 void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) { | 428 void ExtensionApiTest::SetUpCommandLine(base::CommandLine* command_line) { |
| 422 ExtensionBrowserTest::SetUpCommandLine(command_line); | 429 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 423 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); | 430 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); |
| 424 // Backgrounded renderer processes run at a lower priority, causing the | 431 // Backgrounded renderer processes run at a lower priority, causing the |
| 425 // tests to take more time to complete. Disable backgrounding so that the | 432 // tests to take more time to complete. Disable backgrounding so that the |
| 426 // tests don't time out. | 433 // tests don't time out. |
| 427 command_line->AppendSwitch(switches::kDisableRendererBackgrounding); | 434 command_line->AppendSwitch(switches::kDisableRendererBackgrounding); |
| 428 } | 435 } |
| OLD | NEW |