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

extensions/common/manifest_handlers/shared_module_manifest_unittest.cc

 // Copyright 2013 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/version.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
-#include "extensions/common/manifest_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char* kValidImportPath =
     "_modules/abcdefghijklmnopabcdefghijklmnop/foo/bar.html";
 const char* kValidImportPathID = "abcdefghijklmnopabcdefghijklmnop";
 const char* kValidImportPathRelative = "foo/bar.html";
 const char* kInvalidImportPath = "_modules/abc/foo.html";
 const char* kImportId1 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 const char* kImportId2 = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
 const char* kNoImport = "cccccccccccccccccccccccccccccccc";
 
 }  // namespace
 
 namespace extensions {
 
-class SharedModuleManifestTest : public ManifestTest {
+class SharedModuleManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(SharedModuleManifestTest, ExportsAll) {
-  ManifestData manifest("shared_module_export.json");
+  Manifest manifest("shared_module_export.json");
 
   scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
 
   EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension.get()))
       << manifest.name();
   EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension.get()))
       << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo"))
       << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo/bar"))
       << manifest.name();
 
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kImportId1)) << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kImportId2)) << manifest.name();
   EXPECT_FALSE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kNoImport)) << manifest.name();
 }
 
 TEST_F(SharedModuleManifestTest, ExportWhitelistAll) {
-  ManifestData manifest("shared_module_export_no_whitelist.json");
+  Manifest manifest("shared_module_export_no_whitelist.json");
 
   scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
 
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kImportId1)) << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kImportId2)) << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowedByWhitelist(extension.get(),
                   kNoImport)) << manifest.name();
 }
 
 TEST_F(SharedModuleManifestTest, ExportFoo) {
-  ManifestData manifest("shared_module_export_foo.json");
+  Manifest manifest("shared_module_export_foo.json");
 
   scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
 
   EXPECT_TRUE(SharedModuleInfo::IsSharedModule(extension.get()))
       << manifest.name();
   EXPECT_FALSE(SharedModuleInfo::ImportsModules(extension.get()))
       << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo"))
       << manifest.name();
   EXPECT_FALSE(SharedModuleInfo::IsExportAllowed(extension.get(), "foo/bar"))
@@ skipping 25 matching lines @@
   EXPECT_FALSE(SharedModuleInfo::IsImportedPath(kInvalidImportPath));
 
   std::string id;
   std::string relative;
   SharedModuleInfo::ParseImportedPath(kValidImportPath, &id, &relative);
   EXPECT_EQ(id, kValidImportPathID);
   EXPECT_EQ(relative, kValidImportPathRelative);
 }
 
 TEST_F(SharedModuleManifestTest, Import) {
-  ManifestData manifest("shared_module_import.json");
+  Manifest manifest("shared_module_import.json");
 
   scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest);
 
   EXPECT_FALSE(SharedModuleInfo::IsSharedModule(extension.get()))
       << manifest.name();
   EXPECT_TRUE(SharedModuleInfo::ImportsModules(extension.get()))
       << manifest.name();
   const std::vector<SharedModuleInfo::ImportInfo>& imports =
       SharedModuleInfo::GetImports(extension.get());
   ASSERT_EQ(2U, imports.size());
@@ skipping 15 matching lines @@
              "Invalid value for 'import'."),
     Testcase("shared_module_import_invalid_id.json",
              "Invalid value for 'import[0].id'."),
     Testcase("shared_module_import_invalid_version.json",
              "Invalid value for 'import[0].minimum_version'."),
   };
   RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR);
 }
 
 }  // namespace extensions