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

extensions/common/manifest_handlers/externally_connectable_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "extensions/common/permissions/permissions_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ElementsAre;
 
 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(
       scoped_refptr<Extension> extension) {
     return static_cast<ExternallyConnectableInfo*>(
         extension->GetManifestData(manifest_keys::kExternallyConnectable));
   }
+
+ private:
+  ScopedCurrentChannel channel_;
 };
 
 TEST_F(ExternallyConnectableTest, IDsAndMatches) {
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("externally_connectable_ids_and_matches.json");
   ASSERT_TRUE(extension.get());
 
   EXPECT_TRUE(extension->permissions_data()->HasAPIPermission(
       APIPermission::kWebConnectable));
 
@@ skipping 267 matching lines @@
   EXPECT_TRUE(info->matches.MatchesURL(GURL("https://example.com")));
   EXPECT_TRUE(info->matches.MatchesURL(GURL("http://build.chromium.org")));
 }
 
 TEST_F(ExternallyConnectableTest, WarningNothingSpecified) {
   LoadAndExpectWarning("externally_connectable_nothing_specified.json",
                        errors::kErrorNothingSpecified);
 }
 
 }  // namespace extensions