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

chrome/common/extensions/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 "extensions/common/manifest.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 namespace keys = manifest_keys;
 
-// Not named "ManifestTest" because a test utility class has that name.
-class ManifestUnitTest : public testing::Test {
+class ManifestTest : public testing::Test {
  public:
-  ManifestUnitTest() : default_value_("test") {}
+  ManifestTest() : default_value_("test") {}
 
  protected:
   void AssertType(Manifest* manifest, Manifest::Type type) {
     EXPECT_EQ(type, manifest->type());
     EXPECT_EQ(type == Manifest::TYPE_THEME, manifest->is_theme());
     EXPECT_EQ(type == Manifest::TYPE_PLATFORM_APP,
               manifest->is_platform_app());
     EXPECT_EQ(type == Manifest::TYPE_LEGACY_PACKAGED_APP,
               manifest->is_legacy_packaged_app());
     EXPECT_EQ(type == Manifest::TYPE_HOSTED_APP, manifest->is_hosted_app());
@@ skipping 13 matching lines @@
       manifest_value->Set(key, value);
     else
       manifest_value->Remove(key, NULL);
     manifest->reset(new Manifest(Manifest::INTERNAL, manifest_value.Pass()));
   }
 
   std::string default_value_;
 };
 
 // Verifies that extensions can access the correct keys.
-TEST_F(ManifestUnitTest, Extension) {
+TEST_F(ManifestTest, Extension) {
   scoped_ptr<base::DictionaryValue> manifest_value(new base::DictionaryValue());
   manifest_value->SetString(keys::kName, "extension");
   manifest_value->SetString(keys::kVersion, "1");
   // Only supported in manifest_version=1.
   manifest_value->SetString(keys::kBackgroundPageLegacy, "bg.html");
   manifest_value->SetString("unknown_key", "foo");
 
   scoped_ptr<Manifest> manifest(
       new Manifest(Manifest::INTERNAL, manifest_value.Pass()));
   std::string error;
@@ skipping 37 matching lines @@
   // Test DeepCopy and Equals.
   scoped_ptr<Manifest> manifest2(manifest->DeepCopy());
   EXPECT_TRUE(manifest->Equals(manifest2.get()));
   EXPECT_TRUE(manifest2->Equals(manifest.get()));
   MutateManifest(
       &manifest, "foo", new base::StringValue("blah"));
   EXPECT_FALSE(manifest->Equals(manifest2.get()));
 }
 
 // Verifies that key restriction based on type works.
-TEST_F(ManifestUnitTest, ExtensionTypes) {
+TEST_F(ManifestTest, ExtensionTypes) {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   value->SetString(keys::kVersion, "1");
 
   scoped_ptr<Manifest> manifest(
       new Manifest(Manifest::INTERNAL, value.Pass()));
   std::string error;
   std::vector<InstallWarning> warnings;
   EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
   EXPECT_TRUE(error.empty());
@@ skipping 35 matching lines @@
   MutateManifest(
       &manifest, keys::kWebURLs, NULL);
   MutateManifest(
       &manifest, keys::kLaunchWebURL, new base::StringValue("foo"));
   AssertType(manifest.get(), Manifest::TYPE_HOSTED_APP);
   MutateManifest(
       &manifest, keys::kLaunchWebURL, NULL);
 };
 
 // Verifies that the getters filter restricted keys.
-TEST_F(ManifestUnitTest, RestrictedKeys) {
+TEST_F(ManifestTest, RestrictedKeys) {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   value->SetString(keys::kVersion, "1");
 
   scoped_ptr<Manifest> manifest(
       new Manifest(Manifest::INTERNAL, value.Pass()));
   std::string error;
   std::vector<InstallWarning> warnings;
   EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
   EXPECT_TRUE(error.empty());
@@ skipping 25 matching lines @@
   EXPECT_FALSE(manifest->Get(keys::kPageAction, &output));
   MutateManifest(
       &manifest, keys::kPlatformAppBackground, NULL);
 
   // Platform apps also can't have a "Commands" key.
   EXPECT_FALSE(manifest->HasKey(keys::kCommands));
   EXPECT_FALSE(manifest->Get(keys::kCommands, &output));
 };
 
 }  // namespace extensions