Move extensions code from WebContents::GetURL to GetLastCommittedURL.

chrome/browser/extensions/extension_tab_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 66 matching lines @@
   static Browser* GetBrowserFromWindowID(
       ChromeUIThreadExtensionFunction* function,
       int window_id,
       std::string* error_message);
 
   static Browser* GetBrowserFromWindowID(
       const ChromeExtensionFunctionDetails& details,
       int window_id,
       std::string* error_message);
 
+  enum UrlType { LastCommitted, Visible };

[nasko, 2016/10/20 00:48:42]

This along with the methods taking it can potentially move into the anonymous
namespace in the .cc file. I did hit some linker errors when I tried that, but
didn't dig further.

[Devlin, 2016/10/20 17:27:24]

I'm fine with it here (and think it should be; see below).  But we should use an
enum class, and unfortunately chrome requires SCREAMING_STYLE enums (even though
it hurts my ears).

+
   // Creates a Tab object (see chrome/common/extensions/api/tabs.json) with
   // information about the state of a browser tab.  Depending on the
   // permissions of the extension, the object may or may not include sensitive
   // data such as the tab's URL.
   static std::unique_ptr<api::tabs::Tab> CreateTabObject(
       content::WebContents* web_contents,
       const Extension* extension) {
-    return CreateTabObject(web_contents, nullptr, -1, extension);
+    return CreateTabObject(web_contents, nullptr, -1, extension,
+                           UrlType::LastCommitted);
   }
   static std::unique_ptr<api::tabs::Tab> CreateTabObject(
       content::WebContents* web_contents,
       TabStripModel* tab_strip,
       int tab_index,
-      const Extension* extension);
+      const Extension* extension) {
+    return CreateTabObject(web_contents, nullptr, -1, extension,
+                           UrlType::LastCommitted);
+  }
+  static std::unique_ptr<api::tabs::Tab> CreateTabObjectVisibleUrl(

[Devlin, 2016/10/20 17:27:24]

In the tabs API, we'll also scrub the tab object of private data (like urls and
favicons) if the extension doesn't have the "tabs" permission. As such, I think
in this context, "VisibleUrl" is a little ambiguous (visible vs last committed,
or visible meaning present?).  Overall, I'd probably just recommend using the
overload that takes the UrlType in the places we want to specify using the
visible url, rather than adding this separate method.

+      content::WebContents* web_contents,
+      const Extension* extension) {
+    return CreateTabObject(web_contents, nullptr, -1, extension,
+                           UrlType::Visible);
+  }
+  static std::unique_ptr<api::tabs::Tab> CreateTabObject(
+      content::WebContents* web_contents,
+      TabStripModel* tab_strip,
+      int tab_index,
+      const Extension* extension,
+      UrlType url_type);
 
   // Creates a Tab object but performs no extension permissions checks; the
   // returned object will contain privacy-sensitive data.
   static std::unique_ptr<api::tabs::Tab> CreateTabObject(
       content::WebContents* web_contents) {
-    return CreateTabObject(web_contents, nullptr, -1);
+    return CreateTabObject(web_contents, nullptr, -1, UrlType::LastCommitted);
   }
   static std::unique_ptr<api::tabs::Tab> CreateTabObject(
       content::WebContents* web_contents,
       TabStripModel* tab_strip,
-      int tab_index);
+      int tab_index) {
+    return CreateTabObject(web_contents, tab_strip, tab_index,
+                           UrlType::LastCommitted);
+  }
+  static std::unique_ptr<api::tabs::Tab> CreateTabObject(
+      content::WebContents* web_contents,
+      TabStripModel* tab_strip,
+      int tab_index,
+      UrlType url_type);
 
   // Creates a tab MutedInfo object (see chrome/common/extensions/api/tabs.json)
   // with information about the mute state of a browser tab.
   static std::unique_ptr<api::tabs::MutedInfo> CreateMutedInfo(
       content::WebContents* contents);
 
   // Removes any privacy-sensitive fields from a Tab object if appropriate,
   // given the permissions of the extension and the tab in question.  The
   // tab object is modified in place.
   static void ScrubTabForExtension(const Extension* extension,
@@ skipping 53 matching lines @@
   static bool OpenOptionsPage(const Extension* extension, Browser* browser);
 
   // Returns true if the given Browser can report tabs to extensions.
   // Example of Browsers which don't support tabs include apps and devtools.
   static bool BrowserSupportsTabs(Browser* browser);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_