TabSpecificContentSettings: remove redundant GURL copies

Don't need to store the previous_url, NavigationHandle does it for us.

This removes 1 copy on navigation start and 4 copies on commit. It
also simplifies the code a reasonable amount.

Bug: None
Change-Id: I1f19f87a254c6b6fb5147a38da23f66b5db55c01
Reviewed-on: https://chromium-review.googlesource.com/774985Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517499}

chrome/browser/content_settings/content_settings_usages_state_unittest.cc

@@ -15,13 +15,6 @@
 
 namespace {
 
-ContentSettingsUsagesState::CommittedDetails CreateDetailsWithURL(
-    const GURL& url) {
-  ContentSettingsUsagesState::CommittedDetails details;
-  details.current_url = url;
-  return details;
-}
-
 class ContentSettingsUsagesStateTests : public testing::Test {
  public:
   ContentSettingsUsagesStateTests() = default;
@@ -33,9 +26,7 @@ class ContentSettingsUsagesStateTests : public testing::Test {
         HostContentSettingsMapFactory::GetForProfile(&profile), type);
     GURL url_0("http://www.example.com");
 
-    ContentSettingsUsagesState::CommittedDetails details =
-        CreateDetailsWithURL(url_0);
-    state.DidNavigate(details);
+    state.DidNavigate(url_0, GURL());
 
     HostContentSettingsMapFactory::GetForProfile(&profile)
         ->SetContentSettingDefaultScope(url_0, url_0, type, std::string(),
@@ -105,15 +96,13 @@ class ContentSettingsUsagesStateTests : public testing::Test {
 
     state.OnPermissionSet(url_0, true);
 
-    details.previous_url = url_0;
-    state.DidNavigate(details);
+    state.DidNavigate(url_0, url_0);
 
     ContentSettingsUsagesState::StateMap new_state_map =
         state.state_map();
     EXPECT_EQ(state_map.size(), new_state_map.size());
 
-    details.current_url = GURL("http://foo.com");
-    state.DidNavigate(details);
+    state.DidNavigate(GURL("http://foo.com/"), url_0);
 
     EXPECT_TRUE(state.state_map().empty());
 
@@ -130,9 +119,7 @@ class ContentSettingsUsagesStateTests : public testing::Test {
         HostContentSettingsMapFactory::GetForProfile(&profile), type);
     GURL url_0("http://www.example.com");
 
-    ContentSettingsUsagesState::CommittedDetails details =
-        CreateDetailsWithURL(url_0);
-    state.DidNavigate(details);
+    state.DidNavigate(url_0, GURL());
 
     HostContentSettingsMapFactory::GetForProfile(&profile)
         ->SetContentSettingDefaultScope(url_0, url_0, type, std::string(),

chrome/browser/content_settings/tab_specific_content_settings.cc

@@ -779,13 +779,6 @@ void TabSpecificContentSettings::DidStartNavigation(
     return;
   }
 
-  const content::NavigationController& controller =
-      web_contents()->GetController();
-  content::NavigationEntry* last_committed_entry =
-      controller.GetLastCommittedEntry();
-  if (last_committed_entry)
-    previous_url_ = last_committed_entry->GetURL();
-
   // If we're displaying a network error page do not reset the content
   // settings delegate's cookies so the user has a chance to modify cookie
   // settings.
@@ -851,19 +844,14 @@ void TabSpecificContentSettings::ClearMidiContentSettings() {
 
 void TabSpecificContentSettings::GeolocationDidNavigate(
     content::NavigationHandle* navigation_handle) {
-  ContentSettingsUsagesState::CommittedDetails committed_details;
-  committed_details.current_url = navigation_handle->GetURL();
-  committed_details.previous_url = previous_url_;
-
-  geolocation_usages_state_.DidNavigate(committed_details);
+  geolocation_usages_state_.DidNavigate(navigation_handle->GetURL(),
+                                        navigation_handle->GetPreviousURL());
 }
 
 void TabSpecificContentSettings::MidiDidNavigate(
     content::NavigationHandle* navigation_handle) {
-  ContentSettingsUsagesState::CommittedDetails committed_details;
-  committed_details.current_url = navigation_handle->GetURL();
-  committed_details.previous_url = previous_url_;
-  midi_usages_state_.DidNavigate(committed_details);
+  midi_usages_state_.DidNavigate(navigation_handle->GetURL(),
+                                 navigation_handle->GetPreviousURL());
 }
 
 void TabSpecificContentSettings::BlockAllContentForTesting() {

chrome/browser/content_settings/tab_specific_content_settings.h

@@ -457,9 +457,6 @@ class TabSpecificContentSettings
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
-  // Holds the previous committed url during a navigation.
-  GURL previous_url_;
-
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 

components/content_settings/core/browser/content_settings_usages_state.cc

@@ -26,11 +26,12 @@ void ContentSettingsUsagesState::OnPermissionSet(
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 }
 
-void ContentSettingsUsagesState::DidNavigate(const CommittedDetails& details) {
-  embedder_url_ = details.current_url;
+void ContentSettingsUsagesState::DidNavigate(const GURL& url,
+                                             const GURL& previous_url) {
+  embedder_url_ = url;
   if (state_map_.empty())
     return;
-  if (details.previous_url.GetOrigin() != details.current_url.GetOrigin()) {
+  if (previous_url.GetOrigin() != url.GetOrigin()) {
     state_map_.clear();
     return;
   }

components/content_settings/core/browser/content_settings_usages_state.h

@@ -20,12 +20,6 @@ class HostContentSettingsMap;
 // the content setting usage.
 class ContentSettingsUsagesState {
  public:
-  // Information about navigation.
-  struct CommittedDetails {
-    GURL current_url;
-    GURL previous_url;
-  };
-
   ContentSettingsUsagesState(
       HostContentSettingsMap* host_content_settings_map,
       ContentSettingsType type);
@@ -41,7 +35,7 @@ class ContentSettingsUsagesState {
 
   // Delegated by WebContents to indicate a navigation has happened and we
   // may need to clear our settings.
-  void DidNavigate(const CommittedDetails& details);
+  void DidNavigate(const GURL& url, const GURL& previous_url);
 
   void ClearStateMap();