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

chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
index 6c168e0a8b9a820c57fc575692b698f5fe443e62..ddbe4b45a9b5e6ed04daffa0b34889c697c293ae 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.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/csp_info.h"
@@ -18,7 +18,7 @@ namespace extensions {
 
 namespace errors = manifest_errors;
 
-class PlatformAppsManifestTest : public ChromeManifestTest {
+class PlatformAppsManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(PlatformAppsManifestTest, PlatformApps) {
@@ -131,7 +131,7 @@ TEST_F(PlatformAppsManifestTest, CertainApisRequirePlatformApps) {
 
   // First try to load without any flags. This should fail for every API.
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
-    LoadAndExpectError(ManifestData(manifests[i].get(), ""),
+    LoadAndExpectError(Manifest(manifests[i].get(), ""),
                        errors::kExperimentalFlagRequired);
   }
 
@@ -139,7 +139,7 @@ TEST_F(PlatformAppsManifestTest, CertainApisRequirePlatformApps) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
-    LoadAndExpectSuccess(ManifestData(manifests[i].get(), ""));
+    LoadAndExpectSuccess(Manifest(manifests[i].get(), ""));
   }
 }