[sessions] Remove most knowledge of //chrome from core tab restore code

chrome/browser/sessions/persistent_tab_restore_service.cc

 // Copyright 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 "chrome/browser/sessions/persistent_tab_restore_service.h"
 
 #include <cstring>  // memcpy
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/base_session_service_delegate_impl.h"
 #include "components/sessions/base_session_service.h"
 #include "components/sessions/base_session_service_commands.h"
 #include "components/sessions/core/session_constants.h"
 #include "components/sessions/session_command.h"
 #include "content/public/browser/session_storage_namespace.h"
 
 namespace {
 
 // Only written if the tab is pinned.
@@ skipping 80 matching lines @@
 }  // namespace
 
 // PersistentTabRestoreService::Delegate ---------------------------------------
 
 // This restore service will create and own a BaseSessionService and implement
 // the required BaseSessionServiceDelegateImpl.
 class PersistentTabRestoreService::Delegate
     : public BaseSessionServiceDelegateImpl,
       public TabRestoreServiceHelper::Observer {
  public:
-  Delegate(Profile* profile, sessions::TabRestoreServiceClient* client);
+  explicit Delegate(sessions::TabRestoreServiceClient* client);
 
   ~Delegate() override;
 
   // BaseSessionServiceDelegateImpl:
   void OnWillSaveCommands() override;
 
   // TabRestoreServiceHelper::Observer:
   void OnClearEntries() override;
   void OnRestoreEntryById(SessionID::id_type id,
                           Entries::const_iterator entry_iterator) override;
@@ skipping 84 matching lines @@
   // If |id_to_entry| contains an entry for |id| the corresponding entry is
   // deleted and removed from both |id_to_entry| and |entries|. This is used
   // when creating entries from the backend file.
   void RemoveEntryByID(SessionID::id_type id,
                        IDToEntry* id_to_entry,
                        std::vector<TabRestoreService::Entry*>* entries);
 
  private:
   scoped_ptr<sessions::BaseSessionService> base_session_service_;
 
-  // The associated profile.
-  Profile* profile_;
-
   // The associated client.
   sessions::TabRestoreServiceClient* client_;
 
   TabRestoreServiceHelper* tab_restore_service_helper_;
 
   // The number of entries to write.
   int entries_to_write_;
 
   // Number of entries we've written.
   int entries_written_;
 
   // Whether we've loaded the last session.
   int load_state_;
 
   // Results from previously closed tabs/sessions is first added here. When the
   // results from both us and the session restore service have finished loading
   // LoadStateChanged is invoked, which adds these entries to entries_.
   ScopedVector<Entry> staging_entries_;
 
   // Used when loading previous tabs/session and open tabs/session.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
 PersistentTabRestoreService::Delegate::Delegate(
-    Profile* profile,
     sessions::TabRestoreServiceClient* client)
     : BaseSessionServiceDelegateImpl(true),
       base_session_service_(new sessions::BaseSessionService(
           sessions::BaseSessionService::TAB_RESTORE,
-          profile->GetPath(),
+          client->GetPathToSaveTo(),
           this)),
-      profile_(profile),
       client_(client),
       tab_restore_service_helper_(NULL),
       entries_to_write_(0),
       entries_written_(0),
-      load_state_(NOT_LOADED) {
-  // We should never be created when incognito.
-  DCHECK(!profile->IsOffTheRecord());
-}
+      load_state_(NOT_LOADED) {}
 
 PersistentTabRestoreService::Delegate::~Delegate() {}
 
 void PersistentTabRestoreService::Delegate::OnWillSaveCommands() {
   const Entries& entries = tab_restore_service_helper_->entries();
   int to_write_count = std::min(entries_to_write_,
                                 static_cast<int>(entries.size()));
   entries_to_write_ = 0;
   if (entries_written_ + to_write_count > kEntriesPerReset) {
     to_write_count = entries.size();
@@ skipping 639 matching lines @@
   }
 }
 
 // PersistentTabRestoreService -------------------------------------------------
 
 PersistentTabRestoreService::PersistentTabRestoreService(
     Profile* profile,
     scoped_ptr<sessions::TabRestoreServiceClient> client,
     TimeFactory* time_factory)
     : client_(client.Pass()),
-      delegate_(new Delegate(profile, client_.get())),
-      helper_(this, delegate_.get(), profile, time_factory) {
+      delegate_(new Delegate(client_.get())),
+      helper_(this, delegate_.get(), profile, client_.get(), time_factory) {
   delegate_->set_tab_restore_service_helper(&helper_);
 }
 
 PersistentTabRestoreService::~PersistentTabRestoreService() {}
 
 void PersistentTabRestoreService::AddObserver(
     TabRestoreServiceObserver* observer) {
   helper_.AddObserver(observer);
 }
 
@@ skipping 63 matching lines @@
   delegate_->LoadTabsFromLastSession();
 }
 
 TabRestoreService::Entries* PersistentTabRestoreService::mutable_entries() {
   return &helper_.entries_;
 }
 
 void PersistentTabRestoreService::PruneEntries() {
   helper_.PruneEntries();
 }