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

chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc
index b7158312f144f4d553e911e43e774b74b5769c74..cce186b6388fabcf71eedd7972e16c24da715adc 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -12,7 +12,7 @@ using extensions::Extension;
 
 namespace errors = extensions::manifest_errors;
 
-TEST_F(ChromeManifestTest, ManifestVersionError) {
+TEST_F(ExtensionManifestTest, ManifestVersionError) {
   scoped_ptr<base::DictionaryValue> manifest1(new base::DictionaryValue());
   manifest1->SetString("name", "Miles");
   manifest1->SetString("version", "0.55");
@@ -43,13 +43,13 @@ TEST_F(ChromeManifestTest, ManifestVersionError) {
       create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION;
     if (test_data[i].expect_error) {
         LoadAndExpectError(
-            ManifestData(test_data[i].manifest,
+            Manifest(test_data[i].manifest,
                      test_data[i].test_name),
             errors::kInvalidManifestVersionOld,
             extensions::Manifest::UNPACKED,
             create_flags);
     } else {
-      LoadAndExpectSuccess(ManifestData(test_data[i].manifest,
+      LoadAndExpectSuccess(Manifest(test_data[i].manifest,
                                     test_data[i].test_name),
                            extensions::Manifest::UNPACKED,
                            create_flags);