Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc

Issue 7484072: Migrate geolocation settings to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/content_settings/content_settings_pref_provider.cc ('K') | « chrome/browser/geolocation/geolocation_content_settings_map.cc ('k') | chrome/browser/geolocation/geolocation_settings_state.cc » ('j') | chrome/browser/geolocation/geolocation_settings_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc b/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc
deleted file mode 100644
index 6a5067275ec5fcf47aed753293d22ef47e7eedd0..0000000000000000000000000000000000000000
--- a/chrome/browser/geolocation/geolocation_content_settings_map_unittest.cc
+++ /dev/null
@@ -1,317 +0,0 @@
-// 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/base/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"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using ::testing::_;
-
-namespace {
-
-class MockGeolocationSettingsObserver : public NotificationObserver {
- public:
- MockGeolocationSettingsObserver();
-
- virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
-
- MOCK_METHOD2(OnContentSettingsChanged,
- void(GeolocationContentSettingsMap*,
- ContentSettingsType));
-
- private:
- NotificationRegistrar registrar_;
-};
-
-MockGeolocationSettingsObserver::MockGeolocationSettingsObserver() {
- registrar_.Add(this, chrome::NOTIFICATION_GEOLOCATION_SETTINGS_CHANGED,
- NotificationService::AllSources());
-}
-
-void MockGeolocationSettingsObserver::Observe(
- int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
- GeolocationContentSettingsMap* map =
- Source<GeolocationContentSettingsMap>(source).ptr();
- ContentSettingsDetails* settings_details =
- Details<ContentSettingsDetails>(details).ptr();
- OnContentSettingsChanged(map,
- settings_details->type());
- // This checks that calling a Get function from an observer doesn't
- // deadlock.
- // TODO(bauerb): Move into expectation setup.
- map->GetContentSetting(GURL("http://random-hostname.com/"),
- GURL("http://foo.random-hostname.com/"));
-}
-
-class GeolocationContentSettingsMapTests : public testing::Test {
- public:
- GeolocationContentSettingsMapTests()
- : ui_thread_(BrowserThread::UI, &message_loop_) {
- }
-
- protected:
- MessageLoop message_loop_;
- BrowserThread ui_thread_;
-};
-
-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));
-
- GURL requester_0("http://www.frame0.com/foo/bar");
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_0, top_level));
- // Now set the permission for only requester_1.
- map->SetContentSetting(requester_0, top_level, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(top_level, top_level));
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_0, top_level));
- // Block only requester_1.
- map->SetContentSetting(requester_0, top_level, CONTENT_SETTING_BLOCK);
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- map->GetContentSetting(requester_0, top_level));
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(top_level, top_level));
-}
-
-TEST_F(GeolocationContentSettingsMapTests, MultipleEmbeddersAndOrigins) {
- TestingProfile profile;
- GeolocationContentSettingsMap* map =
- profile.GetGeolocationContentSettingsMap();
- GURL requester_0("http://www.iframe0.com/foo/bar");
- GURL requester_1("http://www.iframe1.co.uk/bar/foo");
- GURL embedder_0("http://www.toplevel0.com/foo/bar");
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_0, embedder_0));
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_1, embedder_0));
- // Now set the permission for only one origin.
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_0, embedder_0));
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_1, embedder_0));
- // Set the permission for the other origin.
- map->SetContentSetting(requester_1, embedder_0, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_1, embedder_0));
- // Check they're not allowed on a different embedder.
- GURL embedder_1("http://www.toplevel1.com/foo/bar");
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_0, embedder_1));
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_1, embedder_1));
- // Check all settings are valid.
- GeolocationContentSettingsMap::AllOriginsSettings content_settings(
- map->GetAllOriginsSettings());
- EXPECT_EQ(0U, content_settings.count(requester_0));
- EXPECT_EQ(1U, content_settings.count(requester_0.GetOrigin()));
- GeolocationContentSettingsMap::OneOriginSettings one_origin_settings(
- content_settings[requester_0.GetOrigin()]);
- EXPECT_EQ(CONTENT_SETTING_ALLOW, one_origin_settings[embedder_0.GetOrigin()]);
-
- EXPECT_EQ(0U, content_settings.count(requester_1));
- EXPECT_EQ(1U, content_settings.count(requester_1.GetOrigin()));
- one_origin_settings = content_settings[requester_1.GetOrigin()];
- EXPECT_EQ(CONTENT_SETTING_ALLOW, one_origin_settings[embedder_0.GetOrigin()]);
- // Block requester_1 on the first embedder and add it to the second.
- map->SetContentSetting(requester_1, embedder_0, CONTENT_SETTING_BLOCK);
- map->SetContentSetting(requester_1, embedder_1, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- map->GetContentSetting(requester_1, embedder_0));
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_1, embedder_1));
-}
-
-TEST_F(GeolocationContentSettingsMapTests, SetContentSettingDefault) {
- TestingProfile profile;
- GeolocationContentSettingsMap* map =
- profile.GetGeolocationContentSettingsMap();
- GURL top_level("http://www.toplevel0.com/foo/bar");
- map->SetContentSetting(top_level, top_level, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(top_level, top_level));
- // Set to CONTENT_SETTING_DEFAULT and check the actual value has changed.
- map->SetContentSetting(top_level, top_level, CONTENT_SETTING_DEFAULT);
- EXPECT_EQ(CONTENT_SETTING_ASK, map->GetContentSetting(top_level, top_level));
-}
-
-TEST_F(GeolocationContentSettingsMapTests, Reset) {
- TestingProfile profile;
- GeolocationContentSettingsMap* map =
- profile.GetGeolocationContentSettingsMap();
- GURL requester_0("http://www.iframe0.com/foo/bar");
- GURL embedder_0("http://www.toplevel0.com/foo/bar");
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_0, embedder_0));
- GeolocationContentSettingsMap::AllOriginsSettings content_settings(
- map->GetAllOriginsSettings());
- EXPECT_EQ(1U, content_settings.size());
-
- // Set to CONTENT_SETTING_DEFAULT and check the actual value has changed.
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_DEFAULT);
- EXPECT_EQ(CONTENT_SETTING_ASK,
- map->GetContentSetting(requester_0, embedder_0));
- content_settings = map->GetAllOriginsSettings();
- EXPECT_TRUE(content_settings.empty());
-}
-
-TEST_F(GeolocationContentSettingsMapTests, ClearsWhenSettingBackToDefault) {
- TestingProfile profile;
- GeolocationContentSettingsMap* map =
- profile.GetGeolocationContentSettingsMap();
- GURL requester_0("http://www.iframe0.com/foo/bar");
- GURL requester_1("http://www.iframe1.com/foo/bar");
- GURL embedder_0("http://www.toplevel0.com/foo/bar");
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_0, embedder_0));
- GeolocationContentSettingsMap::AllOriginsSettings content_settings(
- map->GetAllOriginsSettings());
- EXPECT_EQ(1U, content_settings.size());
-
- map->SetContentSetting(requester_1, embedder_0, CONTENT_SETTING_ALLOW);
- EXPECT_EQ(CONTENT_SETTING_ALLOW,
- map->GetContentSetting(requester_1, embedder_0));
- content_settings = map->GetAllOriginsSettings();
- EXPECT_EQ(2U, content_settings.size());
- EXPECT_EQ(1U, content_settings[requester_0.GetOrigin()].size());
- EXPECT_EQ(1U, content_settings[requester_1.GetOrigin()].size());
-
- // Set to default.
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_DEFAULT);
- content_settings = map->GetAllOriginsSettings();
- EXPECT_EQ(1U, content_settings.size());
-
- map->SetContentSetting(requester_1, embedder_0, CONTENT_SETTING_DEFAULT);
- content_settings = map->GetAllOriginsSettings();
- EXPECT_TRUE(content_settings.empty());
-}
-
-TEST_F(GeolocationContentSettingsMapTests, WildCardForEmptyEmbedder) {
- TestingProfile profile;
- GeolocationContentSettingsMap* map =
- profile.GetGeolocationContentSettingsMap();
- GURL requester_0("http://www.iframe0.com/foo/bar");
- GURL embedder_0("http://www.toplevel0.com/foo/bar");
- GURL embedder_1("http://www.toplevel1.com/foo/bar");
- GURL empty_url;
- map->SetContentSetting(requester_0, embedder_0, CONTENT_SETTING_BLOCK);
- map->SetContentSetting(requester_0, empty_url, CONTENT_SETTING_ALLOW);
- 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);
- 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,
- 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,
- 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));
- 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
- // obsolete preference kGeolocationDefaultContentSetting was changed.
- 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,
- profile.GetHostContentSettingsMap()->GetDefaultContentSetting(
- CONTENT_SETTINGS_TYPE_GEOLOCATION));
-}
-
-} // namespace
« chrome/browser/content_settings/content_settings_pref_provider.cc ('K') | « chrome/browser/geolocation/geolocation_content_settings_map.cc ('k') | chrome/browser/geolocation/geolocation_settings_state.cc » ('j') | chrome/browser/geolocation/geolocation_settings_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698