Save-Page-As-Complete-Html: Fixing how links are rewritten in subframes.

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/files/file_path.h"
@@ skipping 1067 matching lines @@
   auto it = frame_tree_node_id_to_contained_save_items_.find(
       target_frame_tree_node_id);
   if (it != frame_tree_node_id_to_contained_save_items_.end()) {
     for (SaveItem* save_item : it->second) {
       DCHECK(save_item->has_final_name());
       saved_links.push_back(save_item->url());
       saved_file_paths.push_back(save_item->file_name());
     }
   }
 
+  base::FilePath directory = target_tree_node->IsMainFrame()
+                                 ? saved_main_directory_path_.BaseName()
+                                 : base::FilePath();
+
   // Ask target frame to serialize itself.
   RenderFrameHostImpl* target = target_tree_node->current_frame_host();
   target->Send(new FrameMsg_GetSerializedHtmlWithLocalLinks(
-      target->GetRoutingID(), saved_links, saved_file_paths,
-      saved_main_directory_path_.BaseName()));
+      target->GetRoutingID(), saved_links, saved_file_paths, directory));
 }
 
 // Process the serialized HTML content data of a specified frame
 // retrieved from the renderer process.
 void SavePackage::OnSerializedHtmlWithLocalLinksResponse(
     RenderFrameHostImpl* sender,
     const std::string& data,
     bool end_of_data) {
   // Check current state.
   if (wait_state_ != HTML_DATA)
@@ skipping 466 matching lines @@
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->OnSavePackageSuccessfullyFinished(download_);
   StopObservation();
 }
 
 }  // namespace content