Save-Page-As-Complete-Html: Each frame links to a distinct local file.

third_party/WebKit/Source/web/WebFrameSerializer.cpp

Index: third_party/WebKit/Source/web/WebFrameSerializer.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameSerializer.cpp b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
index ae8222d0d45b5121f3e1dad2a5893ffc3acfa4b5..411b7b231cbc9a33c0dbf1b527cd137405679940 100644
--- a/third_party/WebKit/Source/web/WebFrameSerializer.cpp
+++ b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
@@ -107,7 +107,7 @@ bool MHTMLFrameSerializerDelegate::rewriteLink(
     if (!frame)
         return false;
 
-    WebString contentID = m_webDelegate.getContentID(*WebFrame::fromFrame(frame));
+    WebString contentID = m_webDelegate.getContentID(WebFrame::fromFrame(frame));
     KURL cidURI = MHTMLParser::convertContentIDToURI(contentID);
     ASSERT(cidURI.isValid());
 
@@ -168,7 +168,7 @@ WebData WebFrameSerializer::generateMHTMLParts(
     serializer.serializeFrame(*frame);
 
     // Get Content-ID for the frame being serialized.
-    String frameContentID = webDelegate->getContentID(*webFrame);
+    String frameContentID = webDelegate->getContentID(webFrame);
     ASSERT(!frameContentID.isEmpty());
 
     // Encode serializer's output as MHTML.
@@ -197,9 +197,9 @@ WebData WebFrameSerializer::generateMHTMLFooter(const WebString& boundary)
 bool WebFrameSerializer::serialize(
     WebLocalFrame* frame,
     WebFrameSerializerClient* client,
-    const WebVector<std::pair<WebURL, WebString>>& urlsToLocalPaths)
+    WebFrameSerializer::LinkRewritingDelegate* delegate)
 {
-    WebFrameSerializerImpl serializerImpl(frame, client, urlsToLocalPaths);
+    WebFrameSerializerImpl serializerImpl(frame, client, delegate);
     return serializerImpl.serialize();
 }