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

chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc

 // Copyright (c) 2012 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/command_line.h"
 #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"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "extensions/common/switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 
-class PlatformAppsManifestTest : public ChromeManifestTest {
+class PlatformAppsManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(PlatformAppsManifestTest, PlatformApps) {
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("init_valid_platform_app.json");
   EXPECT_TRUE(AppIsolationInfo::HasIsolatedStorage(extension.get()));
   EXPECT_FALSE(IncognitoInfo::IsSplitMode(extension.get()));
 
   extension =
       LoadAndExpectSuccess("init_valid_platform_app_no_manifest_version.json");
@@ skipping 92 matching lines @@
     // DictionaryValue will take ownership of this ListValue.
     base::ListValue *permissions = new base::ListValue();
     permissions->Append(new base::StringValue("experimental"));
     permissions->Append(new base::StringValue(api_name));
     manifest->Set("permissions", permissions);
     manifests.push_back(make_linked_ptr(manifest->DeepCopy()));
   }
 
   // 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);
   }
 
   // Now try again with the experimental flag set.
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
   for (size_t i = 0; i < arraysize(kPlatformAppExperimentalApis); ++i) {
-    LoadAndExpectSuccess(ManifestData(manifests[i].get(), ""));
+    LoadAndExpectSuccess(Manifest(manifests[i].get(), ""));
   }
 }
 
 }  // namespace extensions