| 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_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 } // namespace | 107 } // namespace |
| 108 | 108 |
| 109 ExtensionBrowserTest::ExtensionBrowserTest() | 109 ExtensionBrowserTest::ExtensionBrowserTest() |
| 110 : loaded_(false), | 110 : loaded_(false), |
| 111 installed_(false), | 111 installed_(false), |
| 112 #if defined(OS_CHROMEOS) | 112 #if defined(OS_CHROMEOS) |
| 113 set_chromeos_user_(true), | 113 set_chromeos_user_(true), |
| 114 #endif | 114 #endif |
| 115 // Default channel is STABLE but override with UNKNOWN so that unlaunched | 115 // Default channel is STABLE but override with UNKNOWN so that unlaunched |
| 116 // or incomplete APIs can write tests. | 116 // or incomplete APIs can write tests. |
| 117 current_channel_(version_info::Channel::UNKNOWN), | 117 current_channel_(version_info::Channel::STABLE), |
| 118 override_prompt_for_external_extensions_( | 118 override_prompt_for_external_extensions_( |
| 119 FeatureSwitch::prompt_for_external_extensions(), | 119 FeatureSwitch::prompt_for_external_extensions(), |
| 120 false), | 120 false), |
| 121 #if defined(OS_WIN) | 121 #if defined(OS_WIN) |
| 122 user_desktop_override_(base::DIR_USER_DESKTOP), | 122 user_desktop_override_(base::DIR_USER_DESKTOP), |
| 123 common_desktop_override_(base::DIR_COMMON_DESKTOP), | 123 common_desktop_override_(base::DIR_COMMON_DESKTOP), |
| 124 user_quick_launch_override_(base::DIR_USER_QUICK_LAUNCH), | 124 user_quick_launch_override_(base::DIR_USER_QUICK_LAUNCH), |
| 125 start_menu_override_(base::DIR_START_MENU), | 125 start_menu_override_(base::DIR_START_MENU), |
| 126 common_start_menu_override_(base::DIR_COMMON_START_MENU), | 126 common_start_menu_override_(base::DIR_COMMON_START_MENU), |
| 127 #endif | 127 #endif |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( | 604 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( |
| 605 profile(), extension_id, script); | 605 profile(), extension_id, script); |
| 606 } | 606 } |
| 607 | 607 |
| 608 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( | 608 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( |
| 609 const std::string& extension_id, | 609 const std::string& extension_id, |
| 610 const std::string& script) { | 610 const std::string& script) { |
| 611 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( | 611 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( |
| 612 profile(), extension_id, script); | 612 profile(), extension_id, script); |
| 613 } | 613 } |
| OLD | NEW |