Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / permissions / settings_override_permission_unittest.cc

diff --git a/src/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/src/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
index d5b9a04..e154769 100644 (file)
--- a/src/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
+++ b/src/chrome/common/extensions/permissions/settings_override_permission_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
+#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
@@ -18,7 +18,7 @@ namespace extensions {
 
 namespace {
 
-class SettingsOverridePermissionTest : public ExtensionManifestTest {
+class SettingsOverridePermissionTest : public ChromeManifestTest {
  protected:
   enum Flags {
     kHomepage = 1,
@@ -56,7 +56,7 @@ class SettingsOverridePermissionTest : public ExtensionManifestTest {
     ext_manifest.Set(
         manifest_keys::kSettingsOverride, settings_override.release());
 
-    Manifest manifest(&ext_manifest, "test");
+    ManifestData manifest(&ext_manifest, "test");
     return LoadAndExpectSuccess(manifest);
   }
 };
@@ -64,12 +64,12 @@ class SettingsOverridePermissionTest : public ExtensionManifestTest {
 TEST_F(SettingsOverridePermissionTest, HomePage) {
   scoped_refptr<Extension> extension(GetPermissionSet(kHomepage));
   scoped_refptr<const PermissionSet> permission_set(
-      extension->GetActivePermissions());
+      extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
   EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kHomepage));
   std::vector<base::string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      extension->permissions_data()->GetPermissionMessageStrings();
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Change your home page to: google.com/",
             base::UTF16ToUTF8(warnings[0]));
@@ -88,12 +88,12 @@ TEST_F(SettingsOverridePermissionTest, HomePage) {
 TEST_F(SettingsOverridePermissionTest, StartupPages) {
   scoped_refptr<Extension> extension(GetPermissionSet(kStartupPages));
   scoped_refptr<const PermissionSet> permission_set(
-      extension->GetActivePermissions());
+      extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
   EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kStartupPages));
   std::vector<base::string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      extension->permissions_data()->GetPermissionMessageStrings();
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Change your start page to: startup.com/startup.html",
             base::UTF16ToUTF8(warnings[0]));
@@ -112,12 +112,12 @@ TEST_F(SettingsOverridePermissionTest, StartupPages) {
 TEST_F(SettingsOverridePermissionTest, SearchSettings) {
   scoped_refptr<Extension> extension(GetPermissionSet(kSearchProvider));
   scoped_refptr<const PermissionSet> permission_set(
-      extension->GetActivePermissions());
+      extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
   EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));
   std::vector<base::string16> warnings =
-      PermissionsData::GetPermissionMessageStrings(extension.get());
+      extension->permissions_data()->GetPermissionMessageStrings();
   ASSERT_EQ(1u, warnings.size());
   EXPECT_EQ("Change your search settings to: google.com",
             base::UTF16ToUTF8(warnings[0]));
@@ -136,7 +136,7 @@ TEST_F(SettingsOverridePermissionTest, All) {
   scoped_refptr<Extension> extension(GetPermissionSet(
       kSearchProvider | kStartupPages | kHomepage));
   scoped_refptr<const PermissionSet> permission_set(
-      extension->GetActivePermissions());
+      extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
   EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));
@@ -154,7 +154,7 @@ TEST_F(SettingsOverridePermissionTest, Some) {
   scoped_refptr<Extension> extension(GetPermissionSet(
       kSearchProvider | kHomepage));
   scoped_refptr<const PermissionSet> permission_set(
-      extension->GetActivePermissions());
+      extension->permissions_data()->active_permissions());
 
 #if defined(OS_WIN)
   EXPECT_TRUE(permission_set->HasAPIPermission(APIPermission::kSearchProvider));