Migrate default geolocation content setting to host content settings map.

chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc

 // Copyright (c) 2011 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 "base/message_loop.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 45 matching lines @@
  public:
   GeolocationContentSettingsMapTests()
     : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   MessageLoop message_loop_;
   BrowserThread ui_thread_;
 };
 
-TEST_F(GeolocationContentSettingsMapTests, DefaultValues) {
-  TestingProfile profile;
-  GeolocationContentSettingsMap* map =
-      profile.GetGeolocationContentSettingsMap();
-
-  // Check setting defaults.
-  EXPECT_EQ(CONTENT_SETTING_ASK, map->GetDefaultContentSetting());
-  map->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
-  EXPECT_EQ(CONTENT_SETTING_BLOCK, map->GetDefaultContentSetting());
-}
-
 TEST_F(GeolocationContentSettingsMapTests, Embedder) {
   TestingProfile profile;
   GeolocationContentSettingsMap* map =
       profile.GetGeolocationContentSettingsMap();
   GURL top_level("http://www.toplevel0.com/foo/bar");
   EXPECT_EQ(CONTENT_SETTING_ASK, map->GetContentSetting(top_level, top_level));
   // Now set the permission for requester_0.
   map->SetContentSetting(top_level, top_level, CONTENT_SETTING_ALLOW);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(top_level, top_level));
@@ skipping 143 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(requester_0, embedder_0));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(requester_0, embedder_1));
   EXPECT_EQ(CONTENT_SETTING_ASK,
             map->GetContentSetting(requester_0, requester_0));
 
   // Change the wildcard behavior.
   map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_ALLOW);
   map->SetContentSetting(requester_0, empty_url, CONTENT_SETTING_BLOCK);
-  map->SetDefaultContentSetting(CONTENT_SETTING_ALLOW);
+  profile.GetHostContentSettingsMap()->SetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(requester_0, embedder_0));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map->GetContentSetting(requester_0, embedder_1));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(requester_0, requester_0));
 }
 
 TEST_F(GeolocationContentSettingsMapTests, IgnoreInvalidURLsInPrefs) {
   TestingProfile profile;
   {
     DictionaryPrefUpdate update(profile.GetPrefs(),
                                 prefs::kGeolocationContentSettings);
     DictionaryValue* all_settings_dictionary = update.Get();
     // For simplicity, use the overloads that do path expansion. As '.' is the
     // path separator, we can't have dotted hostnames (which is fine).
     all_settings_dictionary->SetInteger("http://a/.http://b/",
                                         CONTENT_SETTING_ALLOW);
     all_settings_dictionary->SetInteger("bad_requester.http://b/",
                                         CONTENT_SETTING_ALLOW);
     all_settings_dictionary->SetInteger("http://a/.bad-embedder",
                                         CONTENT_SETTING_ALLOW);
   }
 
   GeolocationContentSettingsMap* map =
       profile.GetGeolocationContentSettingsMap();
-  EXPECT_EQ(CONTENT_SETTING_ASK, map->GetDefaultContentSetting());
+  EXPECT_EQ(CONTENT_SETTING_ASK,
+            profile.GetHostContentSettingsMap()->GetDefaultContentSetting(
+                CONTENT_SETTINGS_TYPE_GEOLOCATION));
 
   // Check the valid entry was read OK.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map->GetContentSetting(GURL("http://a/"), GURL("http://b/")));
   // But everything else should be according to the default.
   EXPECT_EQ(CONTENT_SETTING_ASK,
             map->GetContentSetting(GURL("http://a/"),
             GURL("http://bad-embedder")));
   EXPECT_EQ(CONTENT_SETTING_ASK,
             map->GetContentSetting(GURL("http://a/"),
             GURL("http://example.com")));
   EXPECT_EQ(CONTENT_SETTING_ASK,
             map->GetContentSetting(GURL("http://bad_requester/"),
             GURL("http://b/")));
 }
 
 TEST_F(GeolocationContentSettingsMapTests, Observe) {
   TestingProfile profile;
   GeolocationContentSettingsMap* map =
       profile.GetGeolocationContentSettingsMap();
   MockGeolocationSettingsObserver observer;
 
-  EXPECT_EQ(CONTENT_SETTING_ASK, map->GetDefaultContentSetting());
+  EXPECT_EQ(CONTENT_SETTING_ASK,
+            profile.GetHostContentSettingsMap()->GetDefaultContentSetting(
+                CONTENT_SETTINGS_TYPE_GEOLOCATION));
 
   // Test if a GEOLOCATION_SETTINGS_CHANGED notification is sent after
   // the geolocation default content setting was changed through calling the
   // SetDefaultContentSetting method.
   EXPECT_CALL(
       observer,
       OnContentSettingsChanged(map, CONTENT_SETTINGS_TYPE_DEFAULT));
-  map->SetDefaultContentSetting(CONTENT_SETTING_BLOCK);
+  profile.GetHostContentSettingsMap()->SetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_BLOCK);
   ::testing::Mock::VerifyAndClearExpectations(&observer);
 
-  // Test if a GEOLOCATION_SETTINGS_CHANGED notification is sent after
-  // the preference kGeolocationDefaultContentSetting was changed.
+  // Test if a GEOLOCATION_SETTINGS_CHANGED notification is sent after the
+  // preference obsolete kGeolocationDefaultContentSetting was changed.

[Bernhard Bauer, 2011/07/15 13:31:44]

Nit: swap "preference" and "obsolete".

[markusheintz_, 2011/07/15 16:21:50]

Done.

   PrefService* prefs = profile.GetPrefs();
   EXPECT_CALL(
       observer,
       OnContentSettingsChanged(map, CONTENT_SETTINGS_TYPE_DEFAULT));
   prefs->SetInteger(prefs::kGeolocationDefaultContentSetting,
                     CONTENT_SETTING_ALLOW);
-  EXPECT_EQ(CONTENT_SETTING_ALLOW, map->GetDefaultContentSetting());
+
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
+            profile.GetHostContentSettingsMap()->GetDefaultContentSetting(
+                CONTENT_SETTINGS_TYPE_GEOLOCATION));
 }
 
 }  // namespace