Pepper: Simplify FileDownloader::url().

ppapi/native_client/src/trusted/plugin/file_downloader.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 "ppapi/native_client/src/trusted/plugin/file_downloader.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <string>
 
@@ skipping 110 matching lines @@
     PP_URLLoaderTrusted_StatusCallback progress_callback) {
   PLUGIN_PRINTF(("FileDownloader::Open (url=%s)\n", url.c_str()));
   if (callback.pp_completion_callback().func == NULL ||
       instance_ == NULL ||
       file_io_private_interface_ == NULL)
     return false;
 
   CHECK(instance_ != NULL);
   open_time_ = NaClGetTimeOfDayMicroseconds();
   status_code_ = -1;
-  url_to_open_ = url;
   url_ = url;
   file_open_notify_callback_ = callback;
   mode_ = mode;
   buffer_.clear();
   file_info_.FreeResources();
   pp::URLRequestInfo url_request(instance_);
 
   // Allow CORS.
   // Note that "SetAllowCrossOriginRequests" (currently) has the side effect of
   // preventing credentials from being sent on same-origin requests.  We
@@ skipping 67 matching lines @@
 
 void FileDownloader::OpenFast(const nacl::string& url,
                               PP_FileHandle file_handle,
                               uint64_t file_token_lo, uint64_t file_token_hi) {
   PLUGIN_PRINTF(("FileDownloader::OpenFast (url=%s)\n", url.c_str()));
 
   file_info_.FreeResources();
   CHECK(instance_ != NULL);
   open_time_ = NaClGetTimeOfDayMicroseconds();
   status_code_ = NACL_HTTP_STATUS_OK;
-  url_to_open_ = url;
   url_ = url;
   mode_ = DOWNLOAD_NONE;
   if (not_streaming() && file_handle != PP_kInvalidFileHandle) {
     NaClFileInfo tmp_info = NoFileInfo();
     tmp_info.desc = ConvertFileDescriptor(file_handle);
     tmp_info.file_token.lo = file_token_lo;
     tmp_info.file_token.hi = file_token_hi;
     file_info_.TakeOwnership(&tmp_info);
   }
 }
@@ skipping 27 matching lines @@
         "FileDownloader::InitialResponseIsValid (url_response_=NULL)\n"));
     return false;
   }
 
   pp::Var full_url = url_response_.GetURL();
   if (!full_url.is_string()) {
     PLUGIN_PRINTF((
         "FileDownloader::InitialResponseIsValid (url is not a string)\n"));
     return false;
   }
-  url_ = full_url.AsString();
+  full_url_ = full_url.AsString();
 
   // Note that URLs in the data-URI scheme produce different error
   // codes than other schemes.  This is because data-URI are really a
   // special kind of file scheme, and therefore do not produce HTTP
   // status codes.
   bool status_ok = false;
   status_code_ = url_response_.GetStatusCode();
   switch (url_scheme_) {
     case SCHEME_CHROME_EXTENSION:
       PLUGIN_PRINTF(("FileDownloader::InitialResponseIsValid (chrome-extension "
@@ skipping 86 matching lines @@
         url_response_.GetStatusCode() == kExtensionUrlRequestStatusOk);
 
   // Record the full url from the response.
   pp::Var full_url = url_response_.GetURL();
   PLUGIN_PRINTF(("FileDownloader::URLLoadFinishNotify (full_url=%s)\n",
                  full_url.DebugString().c_str()));
   if (!full_url.is_string()) {
     stream_finish_callback_.RunAndClear(PP_ERROR_FAILED);
     return;
   }
-  url_ = full_url.AsString();
+  full_url_ = full_url.AsString();
 
   // The file is now fully downloaded.
   pp::FileRef file(url_response_.GetBodyAsFileRef());
   if (file.is_null()) {
     PLUGIN_PRINTF(("FileDownloader::URLLoadFinishNotify (file=NULL)\n"));
     stream_finish_callback_.RunAndClear(PP_ERROR_FAILED);
     return;
   }
 
   // Open the file providing an optional callback.
@@ skipping 105 matching lines @@
   if (pp_error == PP_OK) {
     NaClFileInfo tmp_info = NoFileInfo();
     tmp_info.desc = ConvertFileDescriptor(handle);
     file_info_.TakeOwnership(&tmp_info);
   }
 
   stream_finish_callback_.RunAndClear(pp_error);
 }
 
 }  // namespace plugin