Refactor ExtensionManifestTest to allow usage in src/extensions

chrome/common/extensions/api/extension_action/browser_action_manifest_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 "chrome/common/extensions/api/extension_action/action_info.h"
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
+#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 
 namespace {
 
-class BrowserActionManifestTest : public ExtensionManifestTest {
+class BrowserActionManifestTest : public ChromeManifestTest {
 };
 
 TEST_F(BrowserActionManifestTest,
        BrowserActionManifestIcons_NoDefaultIcons) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
       .SetManifest(DictionaryBuilder()
                    .Set("name", "No default properties")
                    .Set("version", "1.0.0")
                    .Set("manifest_version", 2)
@@ skipping 67 matching lines @@
       .Set("name", "Invalid default icon").Set("version", "1.0.0")
       .Set("manifest_version", 2)
       .Set("browser_action",
            DictionaryBuilder().Set(
                "default_icon",
                DictionaryBuilder().Set("19", std::string())  // Invalid value.
                    .Set("24", "icon24.png").Set("38", "icon38.png"))).Build();
 
   base::string16 error = ErrorUtils::FormatErrorMessageUTF16(
       errors::kInvalidIconPath, "19");
-  LoadAndExpectError(Manifest(manifest_value.get(), "Invalid default icon"),
+  LoadAndExpectError(ManifestData(manifest_value.get(), "Invalid default icon"),
                      errors::kInvalidIconPath);
 }
 
 }  // namespace
 }  // namespace extensions