| 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 "base/macros.h" |
| 5 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 6 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" | 7 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" |
| 7 #include "extensions/common/error_utils.h" | 8 #include "extensions/common/error_utils.h" |
| 8 #include "extensions/common/feature_switch.h" | 9 #include "extensions/common/feature_switch.h" |
| 9 #include "extensions/common/manifest_constants.h" | 10 #include "extensions/common/manifest_constants.h" |
| 10 #include "extensions/common/manifest_handlers/options_page_info.h" | 11 #include "extensions/common/manifest_handlers/options_page_info.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 13 |
| 13 using namespace extensions; | 14 using namespace extensions; |
| 14 | 15 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 ASSERT_FALSE(FeatureSwitch::embedded_extension_options()->IsEnabled()); | 134 ASSERT_FALSE(FeatureSwitch::embedded_extension_options()->IsEnabled()); |
| 134 EXPECT_TRUE(TestOptionsPageChromeStyleAndOpenInTab(true)); | 135 EXPECT_TRUE(TestOptionsPageChromeStyleAndOpenInTab(true)); |
| 135 { | 136 { |
| 136 FeatureSwitch::ScopedOverride enable_flag( | 137 FeatureSwitch::ScopedOverride enable_flag( |
| 137 FeatureSwitch::embedded_extension_options(), true); | 138 FeatureSwitch::embedded_extension_options(), true); |
| 138 EXPECT_TRUE(TestOptionsPageChromeStyleAndOpenInTab(false)); | 139 EXPECT_TRUE(TestOptionsPageChromeStyleAndOpenInTab(false)); |
| 139 } | 140 } |
| 140 } | 141 } |
| 141 | 142 |
| 142 } // namespace | 143 } // namespace |
| OLD | NEW |