Remove GetActiveEntry usage from content.

content/browser/download/save_package.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 "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 237 matching lines @@
   }
 
   STLDeleteValues(&saved_success_items_);
   STLDeleteValues(&in_progress_items_);
   STLDeleteValues(&saved_failed_items_);
 
   file_manager_ = NULL;
 }
 
 GURL SavePackage::GetUrlToBeSaved() {
-  // Instead of using web_contents_.GetURL here, we use url() (which is the
-  // "real" url of the page) from the NavigationEntry because it reflects its
-  // origin rather than the displayed one (returned by GetURL) which may be
-  // different (like having "view-source:" on the front).
-  NavigationEntry* active_entry =
-      web_contents()->GetController().GetActiveEntry();
-  return active_entry->GetURL();
+  // The URL to be saved is the real resource URL, not the one displayed to
+  // the user, which can be a friendly format one. Use the NavigationEntry
+  // URL instead of WebContents, since the latter gives us the user visible URL.
+  NavigationEntry* last_committed_entry =
+      web_contents()->GetController().GetLastCommittedEntry();
+  return last_committed_entry ? last_committed_entry->GetURL() : GURL();
 }
 
 void SavePackage::Cancel(bool user_action) {
   if (!canceled()) {
     if (user_action)
       user_canceled_ = true;
     else
       disk_error_occurred_ = true;
     Stop();
   }
@@ skipping 1169 matching lines @@
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->OnSavePackageSuccessfullyFinished(download_);
   StopObservation();
 }
 
 }  // namespace content