Change TabRendererData's url variable name to visible_url.

No change is being made to functionality. TabRendererData currently gets the visible url, this change updates the variable name to reflect this.

Bug: 910739
Change-Id: I7a0bf0e07dc05b5a6f42c20da04c64fe614bc2c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1632554
Commit-Queue: Caroline Rising <corising@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663814}

chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

@@ -563,7 +563,7 @@ TabRendererData BrowserTabStripController::TabRendererDataFromModel(
     data.thumbnail = thumbnail_tab_helper->thumbnail();
   data.network_state = TabNetworkStateForWebContents(contents);
   data.title = tab_ui_helper->GetTitle();
-  data.url = contents->GetURL();
+  data.visible_url = contents->GetVisibleURL();
   data.crashed_status = contents->GetCrashedStatus();
   data.incognito = contents->GetBrowserContext()->IsOffTheRecord();
   data.pinned = model_->IsTabPinned(model_index);

chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc

@@ -478,7 +478,7 @@ void TabHoverCardBubbleView::UpdateCardContent(TabRendererData data) {
   title_label_->SetText(data.title);
 
   base::string16 domain = url_formatter::FormatUrl(
-      data.url,
+      data.visible_url,
       url_formatter::kFormatUrlOmitDefaults |
           url_formatter::kFormatUrlOmitHTTPS |
           url_formatter::kFormatUrlOmitTrivialSubdomains |

chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc

@@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(TabHoverCardBubbleViewBrowserTest, WidgetDataUpdate) {
       BrowserView::GetBrowserViewForBrowser(browser())->tabstrip();
   TabRendererData newTabData = TabRendererData();
   newTabData.title = base::UTF8ToUTF16("Test Tab 2");
-  newTabData.url = GURL("http://example.com/this/should/not/be/seen");
+  newTabData.visible_url = GURL("http://example.com/this/should/not/be/seen");
   tab_strip->AddTabAt(1, newTabData, false);
 
   ShowUi("default");

chrome/browser/ui/views/tabs/tab_icon.cc

@@ -102,7 +102,7 @@ void TabIcon::SetData(const TabRendererData& data) {
   const bool was_showing_load = ShowingLoadingAnimation();
 
   inhibit_loading_animation_ = data.should_hide_throbber;
-  SetIcon(data.url, data.favicon);
+  SetIcon(data.visible_url, data.favicon);
   SetNetworkState(data.network_state);
   SetIsCrashed(data.IsCrashed());
   has_tab_renderer_data_ = true;

chrome/browser/ui/views/tabs/tab_renderer_data.cc

@@ -21,7 +21,8 @@ bool TabRendererData::operator==(const TabRendererData& other) const {
   return favicon.BackedBySameObjectAs(other.favicon) &&
          thumbnail.BackedBySameObjectAs(other.thumbnail) &&
          network_state == other.network_state && title == other.title &&
-         url == other.url && crashed_status == other.crashed_status &&
+         visible_url == other.visible_url &&
+         crashed_status == other.crashed_status &&
          incognito == other.incognito && show_icon == other.show_icon &&
          pinned == other.pinned && blocked == other.blocked &&
          alert_state == other.alert_state &&

chrome/browser/ui/views/tabs/tab_renderer_data.h

@@ -33,7 +33,8 @@ struct TabRendererData {
   ThumbnailImage thumbnail;
   TabNetworkState network_state = TabNetworkState::kNone;
   base::string16 title;
-  GURL url;
+  // This corresponds to WebContents::GetVisibleUrl().
+  GURL visible_url;
   base::TerminationStatus crashed_status =
       base::TERMINATION_STATUS_STILL_RUNNING;
   bool incognito = false;

chrome/browser/ui/views/tabs/tab_unittest.cc

@@ -580,7 +580,7 @@ TEST_F(TabTest, LayeredThrobber) {
   TabIcon* icon = GetTabIcon(tab);
   SetupFakeClock(icon);
   TabRendererData data;
-  data.url = GURL("http://example.com");
+  data.visible_url = GURL("http://example.com");
   EXPECT_FALSE(icon->ShowingLoadingAnimation());
   EXPECT_EQ(TabNetworkState::kNone, tab.data().network_state);