Move GeolocationSettingsState to ContentSettingsUsagesState

chrome/browser/geolocation/geolocation_browsertest.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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 344 matching lines @@
   CheckStringValueFromJavascript(base::DoubleToString(longitude),
                                  "geoGetLastPositionLongitude()");
 }
 
 void GeolocationBrowserTest::SetInfoBarResponse(const GURL& requesting_url,
                                                 bool allowed) {
   WebContents* web_contents =
       current_browser_->tab_strip_model()->GetActiveWebContents();
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
-  const GeolocationSettingsState& settings_state =
-      content_settings->geolocation_settings_state();
-  size_t state_map_size = settings_state.state_map().size();
+  const ContentSettingsUsagesState& usages_state =
+      content_settings->geolocation_usages_state();
+  size_t state_map_size = usages_state.state_map().size();
   ASSERT_TRUE(infobar_);
   LOG(WARNING) << "will set infobar response";
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::Source<NavigationController>(&web_contents->GetController()));
     if (allowed)
       infobar_->AsConfirmInfoBarDelegate()->Accept();
     else
       infobar_->AsConfirmInfoBarDelegate()->Cancel();
     observer.Wait();
   }
 
   InfoBarService::FromWebContents(web_contents)->RemoveInfoBar(infobar_);
   LOG(WARNING) << "infobar response set";
   infobar_ = NULL;
-  EXPECT_GT(settings_state.state_map().size(), state_map_size);
+  EXPECT_GT(usages_state.state_map().size(), state_map_size);
   GURL requesting_origin(requesting_url.GetOrigin());
-  EXPECT_EQ(1U, settings_state.state_map().count(requesting_origin));
+  EXPECT_EQ(1U, usages_state.state_map().count(requesting_origin));
   ContentSetting expected_setting =
         allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   EXPECT_EQ(expected_setting,
-            settings_state.state_map().find(requesting_origin)->second);
+            usages_state.state_map().find(requesting_origin)->second);
 }
 
 void GeolocationBrowserTest::CheckStringValueFromJavascriptForTab(
     const std::string& expected,
     const std::string& function,
     WebContents* web_contents) {
   std::string script(base::StringPrintf(
       "window.domAutomationController.send(%s)", function.c_str()));
   std::string result;
   ASSERT_TRUE(content::ExecuteScriptInFrameAndExtractString(
@@ skipping 317 matching lines @@
 
   set_iframe_xpath("//iframe[@id='iframe_2']");
   AddGeolocationWatch(false);
 
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result = content::ExecuteScript(
       current_browser()->tab_strip_model()->GetActiveWebContents(), script);
   EXPECT_EQ(result, true);
 }