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

chrome/common/extensions/manifest_handlers/automation_unittest.cc

Index: chrome/common/extensions/manifest_handlers/automation_unittest.cc
diff --git a/chrome/common/extensions/manifest_handlers/automation_unittest.cc b/chrome/common/extensions/manifest_handlers/automation_unittest.cc
index 96c13e43aacc083f1d33da8d68088549b79cb4f3..91487826cc1e6f2081777a390a2efd542c9d830f 100644
--- a/chrome/common/extensions/manifest_handlers/automation_unittest.cc
+++ b/chrome/common/extensions/manifest_handlers/automation_unittest.cc
@@ -3,9 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/extensions/manifest_handlers/automation.h"
-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
@@ -15,7 +14,7 @@
 
 namespace extensions {
 
-class AutomationManifestTest : public ChromeManifestTest {
+class AutomationManifestTest : public ExtensionManifestTest {
  public:
   AutomationManifestTest() : channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
 
@@ -157,7 +156,7 @@ TEST_F(AutomationManifestTest, EmptyMatches) {
 TEST_F(AutomationManifestTest, NoValidMatches) {
   std::string error;
   scoped_refptr<Extension> extension =
-      LoadExtension(ManifestData("automation_no_valid_matches.json"), &error);
+      LoadExtension(Manifest("automation_no_valid_matches.json"), &error);
   ASSERT_TRUE(extension.get());
   EXPECT_EQ("", error);
   EXPECT_EQ(2u, extension->install_warnings().size());