Revert of Switching ExtensionSpecialStoragePolicy::IsStorageDurable to use DurableStorage...

chrome/browser/extensions/extension_special_storage_policy_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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 302 matching lines @@
   policy_->RevokeRightsForExtension(protected_app.get());
   ExpectProtectedBy(empty_set, GURL("http://explicit/"));
   ExpectProtectedBy(empty_set, GURL("http://foo.wildcards/"));
   ExpectProtectedBy(empty_set, GURL("https://bar.wildcards/"));
 }
 
 TEST_F(ExtensionSpecialStoragePolicyTest, HasSessionOnlyOrigins) {
   TestingProfile profile;
   content_settings::CookieSettings* cookie_settings =
       CookieSettingsFactory::GetForProfile(&profile).get();
-  policy_ = new ExtensionSpecialStoragePolicy(&profile);
+  policy_ = new ExtensionSpecialStoragePolicy(cookie_settings);
 
   EXPECT_FALSE(policy_->HasSessionOnlyOrigins());
 
   // The default setting can be session-only.
   cookie_settings->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   EXPECT_TRUE(policy_->HasSessionOnlyOrigins());
 
   cookie_settings->SetDefaultCookieSetting(CONTENT_SETTING_ALLOW);
   EXPECT_FALSE(policy_->HasSessionOnlyOrigins());
 
   // Or the session-onlyness can affect individual origins.
   GURL url("http://pattern.com");
   cookie_settings->SetCookieSetting(url, CONTENT_SETTING_SESSION_ONLY);
 
   EXPECT_TRUE(policy_->HasSessionOnlyOrigins());
 
   // Clearing an origin-specific rule.
   cookie_settings->ResetCookieSetting(url);
 
   EXPECT_FALSE(policy_->HasSessionOnlyOrigins());
 }
 
 TEST_F(ExtensionSpecialStoragePolicyTest, IsStorageDurableTest) {
   TestingProfile profile;
-  policy_ = new ExtensionSpecialStoragePolicy(&profile);
-  const GURL kHttpsUrl("https://foo.com");
+  content_settings::CookieSettings* cookie_settings =
+      CookieSettingsFactory::GetForProfile(&profile).get();
+  policy_ = new ExtensionSpecialStoragePolicy(cookie_settings);
+  const GURL kHttpUrl("http://foo.com");
 
-  EXPECT_FALSE(policy_->IsStorageDurable(kHttpsUrl));
+  EXPECT_FALSE(policy_->IsStorageDurable(kHttpUrl));
 
   HostContentSettingsMap* content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
   content_settings_map->SetContentSettingDefaultScope(
-      kHttpsUrl, GURL(), CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(),
+      kHttpUrl, GURL(), CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, std::string(),
       CONTENT_SETTING_ALLOW);
 
-  EXPECT_TRUE(policy_->IsStorageDurable(kHttpsUrl));
+  EXPECT_TRUE(policy_->IsStorageDurable(kHttpUrl));
 }
 
 TEST_F(ExtensionSpecialStoragePolicyTest, NotificationTest) {
   PolicyChangeObserver observer;
   policy_->AddObserver(&observer);
 
   scoped_refptr<Extension> apps[] = {
     CreateProtectedApp(),
     CreateUnlimitedApp(),
   };
@@ skipping 36 matching lines @@
     EXPECT_TRUE(observer.IsCompleted());
   }
 
   observer.ExpectClear();
   policy_->RevokeRightsForAllExtensions();
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(observer.IsCompleted());
 
   policy_->RemoveObserver(&observer);
 }