Revert "Refactor ExtensionManifestTest to allow usage in src/extensions"

extensions/common/manifest_handlers/externally_connectable_unittest.cc

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