Support resaving offline page right after it is being deleted

chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h

 // Copyright 2015 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 CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_MHTML_ARCHIVER_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_MHTML_ARCHIVER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 30 matching lines @@
 //     // Callback is of type OfflinePageModel::SavePageCallback.
 //     model->SavePage(url, std::move(archiver), callback);
 //   }
 class OfflinePageMHTMLArchiver : public OfflinePageArchiver {
  public:
   // Returns the extension name of the offline page file.
   static std::string GetFileNameExtension();
   // Creates a file name for the archive file based on url and title. Public for
   // testing.
   static base::FilePath GenerateFileName(const GURL& url,
-                                         const std::string& title);
+                                         const std::string& title,
+                                         int64_t id);

[fgorski, 2016/03/30 01:43:30]

nit: be consistent with naming, especially if this is archive_id

[jianli, 2016/03/31 21:02:42]

Done.

 
   explicit OfflinePageMHTMLArchiver(content::WebContents* web_contents);
   ~OfflinePageMHTMLArchiver() override;
 
   // OfflinePageArchiver implementation:
   void CreateArchive(const base::FilePath& archives_dir,
+                     int64_t archive_id,
                      const CreateArchiveCallback& callback) override;
 
  protected:
   // Allows to overload the archiver for testing.
   OfflinePageMHTMLArchiver();
 
   // Try to generate MHTML.
   // Might be overridden for testing purpose.
-  virtual void GenerateMHTML(const base::FilePath& archives_dir);
+  virtual void GenerateMHTML(const base::FilePath& archives_dir,
+                             int64_t archive_id);

[fgorski, 2016/03/30 01:43:30]

Seems like there is a compilation error here somewhere.

[jianli, 2016/03/31 21:02:42]

Done.

 
   // Callback for Generating MHTML.
   void OnGenerateMHTMLDone(const GURL& url,
                            const base::FilePath& file_path,
                            int64_t file_size);
 
   // Sends the result of archiving a page to the client that requested archive
   // creation.
   void ReportResult(ArchiverResult result,
                     const GURL& url,
                     const base::FilePath& file_path,
                     int64_t file_size);
   void ReportFailure(ArchiverResult result);
 
  private:
   // Contents of the web page to be serialized. Not owned.
   content::WebContents* web_contents_;
 
   CreateArchiveCallback callback_;
 
   base::WeakPtrFactory<OfflinePageMHTMLArchiver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageMHTMLArchiver);
 };
 
 }  // namespace offline_pages
 
 #endif  // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_MHTML_ARCHIVER_H_