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

chrome/common/extensions/permissions/settings_override_permission_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.
 
 // These tests make sure SettingsOverridePermission values are set correctly.
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.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 "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/settings_override_permission.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
-class SettingsOverridePermissionTest : public ChromeManifestTest {
+class SettingsOverridePermissionTest : public ExtensionManifestTest {
  protected:
   enum Flags {
     kHomepage = 1,
     kStartupPages = 1 << 1,
     kSearchProvider = 1 << 2,
   };
 
   scoped_refptr<Extension> GetPermissionSet(uint32 flags) {
     base::DictionaryValue ext_manifest;
     ext_manifest.SetString(manifest_keys::kName, "test");
@@ skipping 17 matching lines @@
       search_provider->SetString("keyword", "lock");
       search_provider->SetString("encoding", "UTF-8");
       search_provider->SetBoolean("is_default", true);
       search_provider->SetString("favicon_url",
                                  "http://wikipedia.org/wiki/Favicon");
       settings_override->Set("search_provider", search_provider.release());
     }
     ext_manifest.Set(
         manifest_keys::kSettingsOverride, settings_override.release());
 
-    ManifestData manifest(&ext_manifest, "test");
+    Manifest manifest(&ext_manifest, "test");
     return LoadAndExpectSuccess(manifest);
   }
 };
 
 TEST_F(SettingsOverridePermissionTest, HomePage) {
   scoped_refptr<Extension> extension(GetPermissionSet(kHomepage));
   scoped_refptr<const PermissionSet> permission_set(
       extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
@@ skipping 94 matching lines @@
   EXPECT_FALSE(permission_set->HasAPIPermission(APIPermission::kHomepage));
   EXPECT_FALSE(permission_set->HasAPIPermission(APIPermission::kStartupPages));
   EXPECT_FALSE(
       permission_set->HasAPIPermission(APIPermission::kSearchProvider));
 #endif
 }
 
 }  // namespace
 
 }  // namespace extensions