| 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/common/extensions/features/complex_feature.h" | 5 #include "extensions/common/features/complex_feature.h" |
| 6 | 6 |
| 7 #include "chrome/common/extensions/features/api_feature.h" | |
| 8 #include "chrome/common/extensions/features/chrome_channel_feature_filter.h" | 7 #include "chrome/common/extensions/features/chrome_channel_feature_filter.h" |
| 9 #include "chrome/common/extensions/features/feature_channel.h" | 8 #include "chrome/common/extensions/features/feature_channel.h" |
| 10 #include "chrome/common/extensions/features/simple_feature.h" | 9 #include "extensions/common/features/api_feature.h" |
| 10 #include "extensions/common/features/simple_feature.h" |
| 11 #include "extensions/common/test_util.h" | 11 #include "extensions/common/test_util.h" |
| 12 #include "extensions/common/value_builder.h" | 12 #include "extensions/common/value_builder.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 14 |
| 15 using chrome::VersionInfo; | 15 using chrome::VersionInfo; |
| 16 using extensions::APIFeature; | 16 using extensions::APIFeature; |
| 17 using extensions::ComplexFeature; | 17 using extensions::ComplexFeature; |
| 18 using extensions::DictionaryBuilder; | 18 using extensions::DictionaryBuilder; |
| 19 using extensions::Feature; | 19 using extensions::Feature; |
| 20 using extensions::ListBuilder; | 20 using extensions::ListBuilder; |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 api_feature->Parse(ParseJsonDictionaryWithSingleQuotes( | 201 api_feature->Parse(ParseJsonDictionaryWithSingleQuotes( |
| 202 "{" | 202 "{" |
| 203 " 'channel': 'stable'" | 203 " 'channel': 'stable'" |
| 204 "}").get()); | 204 "}").get()); |
| 205 features->push_back(api_feature.release()); | 205 features->push_back(api_feature.release()); |
| 206 | 206 |
| 207 EXPECT_FALSE(ComplexFeature(features.Pass()).IsBlockedInServiceWorker()); | 207 EXPECT_FALSE(ComplexFeature(features.Pass()).IsBlockedInServiceWorker()); |
| 208 } | 208 } |
| 209 | 209 |
| 210 } // namespace | 210 } // namespace |
| OLD | NEW |