| Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| index 204d6bf8e7d67c696ba3607a86a04cafa2c85f79..726262ea9e4e348ba1acc36b50c9775ba940aaa8 100644
|
| --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| @@ -34,25 +34,6 @@
|
| using ::testing::_;
|
| using content::BrowserThread;
|
|
|
| -namespace {
|
| -
|
| -void ExpectObsoleteGeolocationSetting(
|
| - const DictionaryValue& geo_settings_dictionary,
|
| - const GURL& primary_origin,
|
| - const GURL& secondary_origin,
|
| - ContentSetting expected_setting) {
|
| -
|
| - const DictionaryValue* one_origin_settings;
|
| - ASSERT_TRUE(geo_settings_dictionary.GetDictionaryWithoutPathExpansion(
|
| - std::string(primary_origin.spec()), &one_origin_settings));
|
| - int setting_value;
|
| - ASSERT_TRUE(one_origin_settings->GetIntegerWithoutPathExpansion(
|
| - std::string(secondary_origin.spec()), &setting_value));
|
| - EXPECT_EQ(expected_setting, setting_value);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| namespace content_settings {
|
|
|
| class DeadlockCheckerThread : public base::PlatformThread::Delegate {
|
|
|