[TabManager] Move remaining discard logic from TabStripModel to TabManager.

chrome/browser/ui/tabs/tab_strip_model.cc

 // 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.
 
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/memory/tab_manager_web_contents_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/ui/tabs/tab_utils.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "chrome/common/url_constants.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 125 matching lines @@
   bool pinned() const { return pinned_; }
   void set_pinned(bool value) { pinned_ = value; }
   bool blocked() const { return blocked_; }
   void set_blocked(bool value) { blocked_ = value; }
 
  private:
   // Make sure that if someone deletes this WebContents out from under us, it
   // is properly removed from the tab strip.
   void WebContentsDestroyed() override;
 
-  // Marks the tab as no longer discarded if it has been reloaded from another
-  // source (ie: context menu).
-  void DidStartLoading() override;
-
   // The WebContents being tracked by this WebContentsData. The
   // WebContentsObserver does keep a reference, but when the WebContents is
   // deleted, the WebContentsObserver reference is NULLed and thus inaccessible.
   WebContents* contents_;
 
   // The TabStripModel containing this WebContents.
   TabStripModel* tab_strip_model_;
 
   // The group is used to model a set of tabs spawned from a single parent
   // tab. This value is preserved for a given tab as long as the tab remains
@@ skipping 46 matching lines @@
 void TabStripModel::WebContentsData::WebContentsDestroyed() {
   DCHECK_EQ(contents_, web_contents());
 
   // Note that we only detach the contents here, not close it - it's
   // already been closed. We just want to undo our bookkeeping.
   int index = tab_strip_model_->GetIndexOfWebContents(web_contents());
   DCHECK_NE(TabStripModel::kNoTab, index);
   tab_strip_model_->DetachWebContentsAt(index);
 }
 
-void TabStripModel::WebContentsData::DidStartLoading() {
-  // TODO(georgesak): move this into tab_manager.cc.
-  memory::TabManager::WebContentsData::SetDiscardState(contents_, false);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModel, public:
 
 TabStripModel::TabStripModel(TabStripModelDelegate* delegate, Profile* profile)
     : delegate_(delegate),
       profile_(profile),
       closing_all_(false),
       in_notify_(false),
       weak_factory_(this) {
   DCHECK(delegate_);
@@ skipping 1011 matching lines @@
                  ? TabStripModelObserver::CHANGE_REASON_USER_GESTURE
                  : TabStripModelObserver::CHANGE_REASON_NONE;
     CHECK(!in_notify_);
     in_notify_ = true;
     FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
         ActiveTabChanged(old_contents,
                          new_contents,
                          active_index(),
                          reason));
     in_notify_ = false;
-    // TODO(georgesak): move this into tab_manager.cc.
-    memory::TabManager::WebContentsData::SetDiscardState(new_contents, false);
   }
 }
 
 void TabStripModel::NotifyIfActiveOrSelectionChanged(
     WebContents* old_contents,
     NotifyTypes notify_types,
     const ui::ListSelectionModel& old_model) {
   NotifyIfActiveTabChanged(old_contents, notify_types);
 
   if (!selection_model().Equals(old_model)) {
@@ skipping 90 matching lines @@
 
 void TabStripModel::FixOpenersAndGroupsReferencing(int index) {
   WebContents* old_contents = GetWebContentsAtImpl(index);
   for (WebContentsData* data : contents_data_) {
     if (data->group() == old_contents)
       data->set_group(contents_data_[index]->group());
     if (data->opener() == old_contents)
       data->set_opener(contents_data_[index]->opener());
   }
 }