Move GeolocationSettingsState to ContentSettingsUsagesState

chrome/browser/geolocation/chrome_geolocation_permission_context_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 "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
@@ skipping 203 matching lines @@
   InfoBarService::CreateForWebContents(new_tab);
 
   extra_tabs_.push_back(new_tab);
 }
 
 void GeolocationPermissionContextTests::CheckTabContentsState(
     const GURL& requesting_frame,
     ContentSetting expected_content_setting) {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
-  const GeolocationSettingsState::StateMap& state_map =
-      content_settings->geolocation_settings_state().state_map();
+  const ContentSettingsUsagesState::StateMap& state_map =
+      content_settings->geolocation_usages_state().state_map();
   EXPECT_EQ(1U, state_map.count(requesting_frame.GetOrigin()));
   EXPECT_EQ(0U, state_map.count(requesting_frame));
-  GeolocationSettingsState::StateMap::const_iterator settings =
+  ContentSettingsUsagesState::StateMap::const_iterator settings =
       state_map.find(requesting_frame.GetOrigin());
   ASSERT_FALSE(settings == state_map.end())
       << "geolocation state not found " << requesting_frame;
   EXPECT_EQ(expected_content_setting, settings->second);
 }
 
 void GeolocationPermissionContextTests::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
@@ skipping 408 matching lines @@
   details.entry = web_contents()->GetController().GetLastCommittedEntry();
   EXPECT_FALSE(infobar_delegate->ShouldExpire(details));
   // Ensure the infobar will expire when we commit the pending navigation.
   details.entry = web_contents()->GetController().GetActiveEntry();
   EXPECT_TRUE(infobar_delegate->ShouldExpire(details));
 
   // Delete the tab contents.
   DeleteContents();
   delete infobar_delegate;
 }