Index: extensions/common/manifest_handlers/externally_connectable_unittest.cc |
diff --git a/extensions/common/manifest_handlers/externally_connectable_unittest.cc b/extensions/common/manifest_handlers/externally_connectable_unittest.cc |
index 77acf35ddd786e8b5731b5cf632ff50023f499e5..87e29cc66779925c177f16c9dfe3c58014b823dd 100644 |
--- a/extensions/common/manifest_handlers/externally_connectable_unittest.cc |
+++ b/extensions/common/manifest_handlers/externally_connectable_unittest.cc |
@@ -4,8 +4,7 @@ |
#include <algorithm> |
-#include "chrome/common/extensions/features/feature_channel.h" |
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" |
+#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" |
#include "extensions/common/error_utils.h" |
#include "extensions/common/manifest_constants.h" |
#include "extensions/common/manifest_handlers/externally_connectable.h" |
@@ -19,9 +18,11 @@ namespace extensions { |
namespace errors = externally_connectable_errors; |
-class ExternallyConnectableTest : public ExtensionManifestTest { |
+// TODO(jamescook): Convert from ChromeManifestTest to ManifestTest. |
+class ExternallyConnectableTest : public ChromeManifestTest { |
public: |
- ExternallyConnectableTest() : channel_(chrome::VersionInfo::CHANNEL_DEV) {} |
+ ExternallyConnectableTest() {} |
+ virtual ~ExternallyConnectableTest() {} |
protected: |
ExternallyConnectableInfo* GetExternallyConnectableInfo( |
@@ -29,9 +30,6 @@ class ExternallyConnectableTest : public ExtensionManifestTest { |
return static_cast<ExternallyConnectableInfo*>( |
extension->GetManifestData(manifest_keys::kExternallyConnectable)); |
} |
- |
- private: |
- ScopedCurrentChannel channel_; |
}; |
TEST_F(ExternallyConnectableTest, IDsAndMatches) { |