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

chrome/common/extensions/manifest_handlers/automation_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 "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"
 #include "extensions/common/permissions/permissions_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
-class AutomationManifestTest : public ChromeManifestTest {
+class AutomationManifestTest : public ExtensionManifestTest {
  public:
   AutomationManifestTest() : channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
 
  protected:
   AutomationInfo* GetAutomationInfo(scoped_refptr<Extension> extension) {
     return static_cast<AutomationInfo*>(
         extension->GetManifestData(manifest_keys::kAutomation));
   }
 
  private:
@@ skipping 121 matching lines @@
   ASSERT_TRUE(info);
 
   EXPECT_FALSE(info->desktop);
   EXPECT_FALSE(info->interact);
   EXPECT_TRUE(info->matches.is_empty());
 }
 
 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());
   EXPECT_EQ(ErrorUtils::FormatErrorMessage(
                 automation_errors::kErrorInvalidMatch,
                 "www.badpattern.com",
                 URLPattern::GetParseResultString(
                     URLPattern::PARSE_ERROR_MISSING_SCHEME_SEPARATOR)),
             extension->install_warnings()[0].message);
   EXPECT_EQ(automation_errors::kErrorNoMatchesProvided,
@@ skipping 101 matching lines @@
 
   const AutomationInfo* info = AutomationInfo::Get(extension.get());
   ASSERT_TRUE(info);
 
   EXPECT_TRUE(info->desktop);
   EXPECT_TRUE(info->interact);
   EXPECT_TRUE(info->matches.is_empty());
 }
 
 }  // namespace extensions