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

This reverts commit bd1cc624f6fd9761409ee8a8ac5cfd3a5896c87a.

Original CL:
Refactor ExtensionManifestTest to allow usage in src/extensions
https://codereview.chromium.org/572813002

Reason:
Broke the official Win builders due to differences in how they report their
version channel.
http://master.chrome.corp.google.com:8011/builders/win%20trunk/builds/26150

BUG=414917
TEST=unit_tests
TBR=rockot@chromium.org

Review URL: https://codereview.chromium.org/578653005

Cr-Commit-Position: refs/heads/master@{#295172}

6 files changed, 33 insertions, 37 deletions

diff --git a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc b/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
index 022d149..bb87595 100644
--- a/chrome/common/extensions/api/commands/commands_manifest_unittest.cc
+++ b/chrome/common/extensions/api/commands/commands_manifest_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 "base/command_line.h"
 #include "base/strings/string_util.h"
@@ -17,7 +17,7 @@ namespace extensions {
 
 namespace errors = manifest_errors;
 
-class CommandsManifestTest : public ChromeManifestTest {
+class CommandsManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(CommandsManifestTest, CommandManifestSimple) {
diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
index 98544f8..f69ae14 100644
--- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
+++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/extension_action/action_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/extension_builder.h"
 #include "extensions/common/extension_icon_set.h"
@@ -17,7 +17,7 @@ namespace errors = manifest_errors;
 
 namespace {
 
-class BrowserActionManifestTest : public ChromeManifestTest {
+class BrowserActionManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(BrowserActionManifestTest,
@@ -105,7 +105,7 @@ TEST_F(BrowserActionManifestTest,
 
   base::string16 error = ErrorUtils::FormatErrorMessageUTF16(
       errors::kInvalidIconPath, "19");
-  LoadAndExpectError(ManifestData(manifest_value.get(), "Invalid default icon"),
+  LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
                      errors::kInvalidIconPath);
 }
 
diff --git a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
index 51a5b4f..7cbf241 100644
--- a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
+++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/extension_action/action_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/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
@@ -17,12 +15,10 @@ namespace extensions {
 namespace errors = manifest_errors;
 namespace keys = manifest_keys;
 
-class PageActionManifestTest : public ChromeManifestTest {
+class PageActionManifestTest : public ExtensionManifestTest {
  protected:
-  virtual base::FilePath GetTestDataDir() OVERRIDE {
-    base::FilePath path;
-    PathService::Get(chrome::DIR_TEST_DATA, &path);
-    return path.AppendASCII("extensions").AppendASCII("page_action");
+  virtual const char* test_data_dir() OVERRIDE {
+    return "page_action";
   }
 
   scoped_ptr<ActionInfo> LoadAction(const std::string& manifest_filename);
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
index d829eaf..16e669e 100644
--- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
+++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h"
 #include "chrome/common/extensions/extension_constants.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/extension_builder.h"
 #include "extensions/common/manifest_constants.h"
@@ -21,7 +21,7 @@ using extensions::ListBuilder;
 
 namespace {
 
-class FileBrowserHandlerManifestTest : public ChromeManifestTest {
+class FileBrowserHandlerManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(FileBrowserHandlerManifestTest, InvalidFileBrowserHandlers) {
diff --git a/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc b/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc
index 351b094..56bbb53 100644
--- a/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc
+++ b/chrome/common/extensions/api/i18n/default_locale_manifest_unittest.cc
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
-#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"
 
 namespace extensions {
 
-class DefaultLocaleManifestTest : public ChromeManifestTest {
+class DefaultLocaleManifestTest : public ExtensionManifestTest {
 };
 
 TEST_F(DefaultLocaleManifestTest, DefaultLocale) {
diff --git a/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc b/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc
index 0606c32..ae383d8 100644
--- a/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc
+++ b/chrome/common/extensions/api/identity/extension_manifests_auth_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/test/values_test_util.h"
 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
-#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"
 
@@ -25,7 +25,7 @@ const char kAutoApproveNotAllowedWarning[] =
 
 }  // namespace
 
-class OAuth2ManifestTest : public ChromeManifestTest {
+class OAuth2ManifestTest : public ExtensionManifestTest {
  protected:
   enum AutoApproveValue {
     AUTO_APPROVE_NOT_SET,
@@ -107,7 +107,7 @@ TEST_F(OAuth2ManifestTest, OAuth2SectionParsing) {
     ext_manifest.SetString(keys::kKey, kExtensionKey);
     ext_manifest.SetBoolean(keys::kOAuth2AutoApprove, true);
 
-    ManifestData manifest(&ext_manifest, "test");
+    Manifest manifest(&ext_manifest, "test");
     scoped_refptr<extensions::Extension> extension =
         LoadAndExpectSuccess(manifest);
     EXPECT_TRUE(extension->install_warnings().empty());
@@ -124,7 +124,7 @@ TEST_F(OAuth2ManifestTest, OAuth2SectionParsing) {
     app_manifest.SetString(keys::kLaunchLocalPath, "launch.html");
     app_manifest.MergeDictionary(&base_manifest);
 
-    ManifestData manifest(&app_manifest, "test");
+    Manifest manifest(&app_manifest, "test");
     scoped_refptr<extensions::Extension> extension =
         LoadAndExpectSuccess(manifest);
     EXPECT_TRUE(extension->install_warnings().empty());
@@ -141,7 +141,7 @@ TEST_F(OAuth2ManifestTest, OAuth2SectionParsing) {
     app_manifest.SetString(keys::kLaunchWebURL, "http://www.google.com");
     app_manifest.MergeDictionary(&base_manifest);
 
-    ManifestData manifest(&app_manifest, "test");
+    Manifest manifest(&app_manifest, "test");
     scoped_refptr<extensions::Extension> extension =
         LoadAndExpectSuccess(manifest);
     EXPECT_EQ(1U, extension->install_warnings().size());
@@ -159,7 +159,7 @@ TEST_F(OAuth2ManifestTest, OAuth2SectionParsing) {
 TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionNotOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_TRUE(extension->install_warnings().empty());
@@ -169,7 +169,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionNotOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionNotOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_FALSE, false, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_EQ(1U, extension->install_warnings().size());
@@ -182,7 +182,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionNotOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionNotOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_TRUE, false, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_EQ(1U, extension->install_warnings().size());
@@ -195,7 +195,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionNotOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionNotOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_INVALID, false, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_EQ(1U, extension->install_warnings().size());
@@ -208,7 +208,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionNotOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_NOT_SET, true, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_TRUE(extension->install_warnings().empty());
@@ -218,7 +218,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_FALSE, true, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_TRUE(extension->install_warnings().empty());
@@ -228,7 +228,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest);
   EXPECT_TRUE(extension->install_warnings().empty());
@@ -238,7 +238,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionOnWhitelist) {
 TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionOnWhitelist) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_INVALID, true, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   std::string error;
   scoped_refptr<extensions::Extension> extension =
       LoadExtension(manifest, &error);
@@ -251,7 +251,7 @@ TEST_F(OAuth2ManifestTest, InvalidClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_NOT_SET);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     std::string error;
     LoadAndExpectError(manifest, errors::kInvalidOAuth2ClientId);
   }
@@ -259,7 +259,7 @@ TEST_F(OAuth2ManifestTest, InvalidClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_EMPTY);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     std::string error;
     LoadAndExpectError(manifest, errors::kInvalidOAuth2ClientId);
   }
@@ -270,7 +270,7 @@ TEST_F(OAuth2ManifestTest, ComponentInvalidClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_NOT_SET);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     std::string error;
     LoadAndExpectError(manifest,
                        errors::kInvalidOAuth2ClientId,
@@ -280,7 +280,7 @@ TEST_F(OAuth2ManifestTest, ComponentInvalidClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_EMPTY);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     std::string error;
     LoadAndExpectError(manifest,
                        errors::kInvalidOAuth2ClientId,
@@ -292,7 +292,7 @@ TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_NOT_SET);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     scoped_refptr<extensions::Extension> extension =
         LoadAndExpectSuccess(manifest, extensions::Manifest::COMPONENT);
     EXPECT_TRUE(OAuth2Info::GetOAuth2Info(extension.get()).client_id.empty());
@@ -302,7 +302,7 @@ TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
   {
     base::DictionaryValue* ext_manifest =
         CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_EMPTY);
-    ManifestData manifest(ext_manifest, "test");
+    Manifest manifest(ext_manifest, "test");
     scoped_refptr<extensions::Extension> extension =
         LoadAndExpectSuccess(manifest, extensions::Manifest::COMPONENT);
     EXPECT_TRUE(OAuth2Info::GetOAuth2Info(extension.get()).client_id.empty());
@@ -313,7 +313,7 @@ TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
 TEST_F(OAuth2ManifestTest, ComponentWithStandardClientId) {
   base::DictionaryValue* ext_manifest =
       CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_DEFAULT);
-  ManifestData manifest(ext_manifest, "test");
+  Manifest manifest(ext_manifest, "test");
   scoped_refptr<extensions::Extension> extension =
       LoadAndExpectSuccess(manifest, extensions::Manifest::COMPONENT);
   EXPECT_EQ("client1", OAuth2Info::GetOAuth2Info(extension.get()).client_id);