Move extensions code from WebContents::GetURL to GetLastCommittedURL.

chrome/browser/extensions/extension_tab_util.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/extensions/extension_tab_util.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 315 matching lines @@
 
 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
   return SessionTabHelper::IdForWindowContainingTab(web_contents);
 }
 
 // static
 std::unique_ptr<api::tabs::Tab> ExtensionTabUtil::CreateTabObject(
     WebContents* contents,
     TabStripModel* tab_strip,
     int tab_index,
-    const Extension* extension) {
+    const Extension* extension,
+    UrlType url_type) {
   // If we have a matching AppWindow with a controller, get the tab value
   // from its controller instead.
   WindowController* controller = GetAppWindowController(contents);
   if (controller &&
       (!extension || controller->IsVisibleToExtension(extension))) {
     return controller->CreateTabObject(extension, tab_index);
   }
   std::unique_ptr<api::tabs::Tab> result =
-      CreateTabObject(contents, tab_strip, tab_index);
+      CreateTabObject(contents, tab_strip, tab_index, url_type);
   ScrubTabForExtension(extension, contents, result.get());
   return result;
 }
 
 std::unique_ptr<base::ListValue> ExtensionTabUtil::CreateTabList(
     const Browser* browser,
     const Extension* extension) {
   std::unique_ptr<base::ListValue> tab_list(new base::ListValue());
   TabStripModel* tab_strip = browser->tab_strip_model();
   for (int i = 0; i < tab_strip->count(); ++i) {
     tab_list->Append(
         CreateTabObject(tab_strip->GetWebContentsAt(i), tab_strip, i, extension)
             ->ToValue());
   }
 
   return tab_list;
 }
 
 // static
 std::unique_ptr<api::tabs::Tab> ExtensionTabUtil::CreateTabObject(
     content::WebContents* contents,
     TabStripModel* tab_strip,
-    int tab_index) {
+    int tab_index,
+    UrlType url_type) {
   // If we have a matching AppWindow with a controller, get the tab value
   // from its controller instead.
   WindowController* controller = GetAppWindowController(contents);
   if (controller)
     return controller->CreateTabObject(nullptr, tab_index);
 
   if (!tab_strip)
     ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index);
   bool is_loading = contents->IsLoading();
   std::unique_ptr<api::tabs::Tab> tab_object(new api::tabs::Tab);
@@ skipping 10 matching lines @@
       g_browser_process->GetTabManager()->IsTabDiscarded(contents);
   tab_object->auto_discardable =
       g_browser_process->GetTabManager()->IsTabAutoDiscardable(contents);
   tab_object->muted_info = CreateMutedInfo(contents);
   tab_object->incognito = contents->GetBrowserContext()->IsOffTheRecord();
   tab_object->width.reset(
       new int(contents->GetContainerBounds().size().width()));
   tab_object->height.reset(
       new int(contents->GetContainerBounds().size().height()));
 
-  tab_object->url.reset(new std::string(contents->GetURL().spec()));
+  GURL url;
+  switch (url_type) {
+    case LastCommitted:
+      url = contents->GetLastCommittedURL();
+    case Visible:
+      url = contents->GetVisibleURL();
+  }
+  tab_object->url.reset(new std::string(url.spec()));
   tab_object->title.reset(
       new std::string(base::UTF16ToUTF8(contents->GetTitle())));
   NavigationEntry* entry = contents->GetController().GetVisibleEntry();
   if (entry && entry->GetFavicon().valid)
     tab_object->fav_icon_url.reset(
         new std::string(entry->GetFavicon().url.spec()));
   if (tab_strip) {
     WebContents* opener = tab_strip->GetOpenerOfWebContentsAt(tab_index);
     if (opener)
       tab_object->opener_tab_id.reset(new int(GetTabIdForExtensions(opener)));
@@ skipping 256 matching lines @@
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
   return true;
 }
 
 // static
 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) {
   return browser && browser->tab_strip_model() && !browser->is_devtools();
 }
 
 }  // namespace extensions