Pepper: Simplify FileDownloader::url().

ppapi/native_client/src/trusted/plugin/file_downloader.h

Index: ppapi/native_client/src/trusted/plugin/file_downloader.h
diff --git a/ppapi/native_client/src/trusted/plugin/file_downloader.h b/ppapi/native_client/src/trusted/plugin/file_downloader.h
index 2dee5879513820b21c74d67257620171cef96bd4..92dfb23a98f8b92add45abfbbe9014401a979af7 100644
--- a/ppapi/native_client/src/trusted/plugin/file_downloader.h
+++ b/ppapi/native_client/src/trusted/plugin/file_downloader.h
@@ -142,15 +142,13 @@ class FileDownloader {
   // Returns the time delta between the call to Open() and this function.
   int64_t TimeSinceOpenMilliseconds() const;
 
-  // The value of |url_| changes over the life of this instance.  When the file
-  // is first opened, |url_| is a copy of the URL used to open the file, which
-  // can be a relative URL.  Once the GET request has finished, and the contents
-  // of the file represented by |url_| are available, |url_| is the full URL
-  // including the scheme, host and full path.
+  // Returns the url passed to Open().
   const nacl::string& url() const { return url_; }
 
-  // Returns the url passed to Open().
-  const nacl::string& url_to_open() const { return url_to_open_; }
+  // Once the GET request has finished, and the contents of the file
+  // represented by |url_| are available, |url_| is the full URL including the
+  // scheme, host and full path.

[dmichael (off chromium), 2014/03/05 16:11:35]

This comment needs to be updated with the new method. And maybe note what it
returns before the full URL is available (empty string?)

+  const nacl::string& full_url() const { return full_url_; }
 
   // Returns the PP_Resource of the active URL loader, or kInvalidResource.
   PP_Resource url_loader() const { return url_loader_.pp_resource(); }
@@ -208,8 +206,9 @@ class FileDownloader {
   void GotFileHandleNotify(int32_t pp_error, PP_FileHandle handle);
 
   Plugin* instance_;
-  nacl::string url_to_open_;
   nacl::string url_;
+  nacl::string full_url_;
+
   nacl::string extra_request_headers_;
   pp::URLResponseInfo url_response_;
   pp::CompletionCallback file_open_notify_callback_;