Refactoring of SessionService to get componentized.

chrome/browser/sessions/session_backend.h

 // Copyright (c) 2011 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_SESSIONS_SESSION_BACKEND_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_BACKEND_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 43 matching lines @@
   // NOTE: this is invoked before every command, and does nothing if we've
   // already Init'ed.
   void Init();
   bool inited() const { return inited_; }
 
   // Appends the specified commands to the current file. If reset_first is
   // true the the current file is recreated.
   //
   // NOTE: this deletes SessionCommands in commands as well as the supplied
   // vector.
-  void AppendCommands(std::vector<SessionCommand*>* commands,
-                      bool reset_first);
+  void AppendCommands(ScopedVector<SessionCommand>* commands, bool reset_first);
 
   // Invoked from the service to read the commands that make up the last
   // session, invokes ReadLastSessionCommandsImpl to do the work.
   void ReadLastSessionCommands(
       const base::CancelableTaskTracker::IsCanceledCallback& is_canceled,
-      const BaseSessionService::InternalGetCommandsCallback& callback);
+      const BaseSessionService::GetCommandsCallback& callback);
 
   // Reads the commands from the last file.
   //
-  // On success, the read commands are added to commands. It is up to the
-  // caller to delete the commands.
-  bool ReadLastSessionCommandsImpl(std::vector<SessionCommand*>* commands);
+  // On success, the read commands are added to commands.
+  bool ReadLastSessionCommandsImpl(ScopedVector<SessionCommand>* commands);
 
   // Deletes the file containing the commands for the last session.
   void DeleteLastSession();
 
   // Moves the current session to the last and resets the current. This is
   // called during startup and if the user launchs the app and no tabbed
   // browsers are running.
   void MoveCurrentSessionToLastSession();
 
   // Reads the commands from the current file.
   //
   // On success, the read commands are added to commands. It is up to the
   // caller to delete the commands.
-  bool ReadCurrentSessionCommandsImpl(std::vector<SessionCommand*>* commands);
+  bool ReadCurrentSessionCommandsImpl(ScopedVector<SessionCommand>* commands);
 
  private:
   friend class base::RefCountedThreadSafe<SessionBackend>;
 
   ~SessionBackend();
 
   // If current_session_file_ is open, it is truncated so that it is essentially
   // empty (only contains the header). If current_session_file_ isn't open, it
   // is is opened and the header is written to it. After this
   // current_session_file_ contains no commands.
   // NOTE: current_session_file_ may be NULL if the file couldn't be opened or
   // the header couldn't be written.
   void ResetFile();
 
   // Opens the current file and writes the header. On success a handle to
   // the file is returned.
   base::File* OpenAndWriteHeader(const base::FilePath& path);
 
   // Appends the specified commands to the specified file.
   bool AppendCommandsToFile(base::File* file,
-                            const std::vector<SessionCommand*>& commands);
+                            const ScopedVector<SessionCommand>& commands);
 
   const BaseSessionService::SessionType type_;
 
   // Returns the path to the last file.
   base::FilePath GetLastSessionPath();
 
   // Returns the path to the current file.
   base::FilePath GetCurrentSessionPath();
 
   // Directory files are relative to.
   const base::FilePath path_to_dir_;
 
   // Whether the previous target file is valid.
   bool last_session_valid_;
 
   // Handle to the target file.
   scoped_ptr<base::File> current_session_file_;
 
   // Whether we've inited. Remember, the constructor is run on the
   // Main thread, all others on the IO thread, hence lazy initialization.
   bool inited_;
 
   // If true, the file is empty (no commands have been added to it).
   bool empty_file_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionBackend);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_BACKEND_H_