Remove refcounting from SavePackage.

content/browser/download/save_package.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 #define CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/download/save_types.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/referrer.h"
 #include "net/base/net_errors.h"
@@ skipping 19 matching lines @@
 // page as complete-html page means we save not only the main html file the user
 // told it to save but also a directory for the auxiliary files such as all
 // sub-frame html files, image files, css files and js files.  Saving page as
 // MHTML means the same thing as complete-html, but it uses the MHTML format to
 // contain the html and all auxiliary files in a single text file.
 //
 // Each page saving job may include one or multiple files which need to be
 // saved. Each file is represented by a SaveItem, and all SaveItems are owned
 // by the SavePackage. SaveItems are created when a user initiates a page
 // saving job, and exist for the duration of one contents's life time.
-class CONTENT_EXPORT SavePackage
-    : public base::RefCountedThreadSafe<SavePackage>,
-      public WebContentsObserver,
-      public DownloadItem::Observer,
-      public base::SupportsWeakPtr<SavePackage> {
+class CONTENT_EXPORT SavePackage : public WebContentsObserver,
+                                   public DownloadItem::Observer,
+                                   public base::SupportsWeakPtr<SavePackage> {
  public:
   enum WaitState {
     // State when created but not initialized.
     INITIALIZE = 0,
     // State when after initializing, but not yet saving.
     START_PROCESS,
     // Waiting on a list of savable resources from the backend.
     RESOURCES_LIST,
     // Waiting for data sent from net IO or from file system.
     NET_FILES,
@@ skipping 13 matching lines @@
   explicit SavePackage(WebContents* web_contents);
 
   // This contructor is used only for testing. We can bypass the file and
   // directory name generation / sanitization by providing well known paths
   // better suited for tests.
   SavePackage(WebContents* web_contents,
               SavePageType save_type,
               const base::FilePath& file_full_path,
               const base::FilePath& directory_full_path);
 
+  ~SavePackage() override;
+
   // Initialize the SavePackage. Returns true if it initializes properly.  Need
   // to make sure that this method must be called in the UI thread because using
   // g_browser_process on a non-UI thread can cause crashes during shutdown.
   // |cb| will be called when the DownloadItem is created, before data is
   // written to disk.
   bool Init(const SavePackageDownloadCreatedCallback& cb);
 
   // Cancel all in progress request, might be called by user or internal error.
   void Cancel(bool user_action);
 
@@ skipping 15 matching lines @@
 
   bool canceled() const { return user_canceled_ || disk_error_occurred_; }
   bool finished() const { return finished_; }
   SavePageType save_type() const { return save_type_; }
 
   SavePackageId id() const { return unique_id_; }
 
   void GetSaveInfo();
 
  private:
-  friend class base::RefCountedThreadSafe<SavePackage>;
-
   void InitWithDownloadItem(
       const SavePackageDownloadCreatedCallback& download_created_callback,
       DownloadItemImpl* item);
 
   // Callback for WebContents::GenerateMHTML().
   void OnMHTMLGenerated(int64_t size);
 
   // For testing only.
   SavePackage(WebContents* web_contents,
               const base::FilePath& file_full_path,
               const base::FilePath& directory_full_path);
 
-  ~SavePackage() override;
-
   // Notes from Init() above applies here as well.
   void InternalInit();
 
   void Stop();
   void CheckFinish();
 
   // Initiate a saving job of a specific URL. We send the request to
   // SaveFileManager, which will dispatch it to different approach according to
   // the save source. |process_all_remaining_items| indicates whether we need to
   // save all remaining items.
@@ skipping 110 matching lines @@
 
   // Retrieves the URL to be saved from the WebContents.
   GURL GetUrlToBeSaved();
 
   void CreateDirectoryOnFileThread(const base::FilePath& website_save_dir,
                                    const base::FilePath& download_save_dir,
                                    bool skip_dir_check,
                                    const std::string& mime_type);
   void ContinueGetSaveInfo(const base::FilePath& suggested_path,
                            bool can_save_as_complete);
-  void OnPathPicked(
-      const base::FilePath& final_name,
-      SavePageType type,
-      const SavePackageDownloadCreatedCallback& cb);
+  void OnPathPicked(const base::FilePath& final_name,
+                    SavePageType type,

[asanka, 2016/06/06 18:55:09]

There's a bunch of unrelated formatting changes in this CL. Could you remove
those? You can use 'git cl format' to format just the blocks that you are
touching.

+                    const SavePackageDownloadCreatedCallback& cb);
 
   // Map from SaveItem::id() (aka save_item_id) into a SaveItem.
   using SaveItemIdMap =
       std::unordered_map<SaveItemId, SaveItem*, SaveItemId::Hasher>;
   // Map of all saving job in in-progress state.
   SaveItemIdMap in_progress_items_;
   // Map of all saving job which are failed.
   SaveItemIdMap saved_failed_items_;
 
   // The number of in process SaveItems.
@@ skipping 20 matching lines @@
   base::FilePath GetSuggestedNameForSaveAs(
       bool can_save_as_complete,
       const std::string& contents_mime_type);
 
   // Ensures that the file name has a proper extension for HTML by adding ".htm"
   // if necessary.
   static base::FilePath EnsureHtmlExtension(const base::FilePath& name);
 
   // Ensures that the file name has a proper extension for supported formats
   // if necessary.
-  static base::FilePath EnsureMimeExtension(const base::FilePath& name,
+  static base::FilePath EnsureMimeExtension(
+      const base::FilePath& name,
       const std::string& contents_mime_type);
 
   // Returns extension for supported MIME types (for example, for "text/plain"
   // it returns "txt").
   static const base::FilePath::CharType* ExtensionForMimeType(
       const std::string& contents_mime_type);
 
   using SaveItemQueue = std::deque<SaveItem*>;
   // A queue for items we are about to start saving.
   SaveItemQueue waiting_item_queue_;
@@ skipping 50 matching lines @@
 
   // Indicates whether user get disk error.
   bool disk_error_occurred_;
 
   // Type about saving page as only-html or complete-html.
   SavePageType save_type_;
 
   // Number of all need to be saved resources.
   size_t all_save_items_count_;
 
-  using FileNameSet =
-      std::set<base::FilePath::StringType,
-               bool (*)(base::FilePath::StringPieceType,
-                        base::FilePath::StringPieceType)>;
+  using FileNameSet = std::set<base::FilePath::StringType,
+                               bool (*)(base::FilePath::StringPieceType,
+                                        base::FilePath::StringPieceType)>;
   // This set is used to eliminate duplicated file names in saving directory.
   FileNameSet file_name_set_;
 
   using FileNameCountMap =
       std::unordered_map<base::FilePath::StringType, uint32_t>;
   // This map is used to track serial number for specified filename.
   FileNameCountMap file_name_count_map_;
 
   // Indicates current waiting state when SavePackage try to get something
   // from outside.
@@ skipping 10 matching lines @@
   friend class SavePackageTest;
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestSuggestedSaveNames);
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestLongSafePureFilename);
 
   DISALLOW_COPY_AND_ASSIGN(SavePackage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_