Pepper: Simplify FileDownloader::url().

ppapi/native_client/src/trusted/plugin/file_downloader.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 NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_
 
 #include <deque>
 
 #include "native_client/src/include/nacl_macros.h"
@@ skipping 124 matching lines @@
   // Return a structure describing the file opened, including a file desc.
   // If downloading and opening succeeded, this returns a valid read-only
   // POSIX file descriptor.  On failure, the return value is an invalid
   // descriptor.  The file descriptor is owned by this instance, so the
   // delegate does not have to close it.
   struct NaClFileInfo GetFileInfo();
 
   // 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(); }
 
   // GetDownloadProgress() returns the current download progress, which is
   // meaningful after Open() has been called. Progress only refers to the
   // response body and does not include the headers.
   //
   // This data is only available if the |record_progress| true in the
   // Open() call.  If progress is being recorded, then |bytes_received|
@@ skipping 37 matching lines @@
   // The public Open*() functions start step 1), and the public FinishStreaming
   // function proceeds to step 2) and 3).
   bool InitialResponseIsValid();
   void URLLoadStartNotify(int32_t pp_error);
   void URLLoadFinishNotify(int32_t pp_error);
   void URLReadBodyNotify(int32_t pp_error);
   void StreamFinishNotify(int32_t pp_error);
   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_;
   pp::CompletionCallback stream_finish_callback_;
   pp::FileIO file_reader_;
   const PPB_FileIO_Private* file_io_private_interface_;
   const PPB_URLLoaderTrusted* url_loader_trusted_interface_;
   pp::URLLoader url_loader_;
   pp::CompletionCallbackFactory<FileDownloader> callback_factory_;
   int64_t open_time_;
   int32_t status_code_;
   DownloadMode mode_;
   bool open_and_stream_;
   static const uint32_t kTempBufferSize = 2048;
   std::vector<char> temp_buffer_;
   std::deque<char> buffer_;
   UrlSchemeType url_scheme_;
   StreamCallbackSource* data_stream_callback_source_;
   NaClFileInfoAutoCloser file_info_;
 };
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_