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

chrome/browser/memory/tab_manager_unittest.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/memory/tab_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 205 matching lines @@
   EXPECT_TRUE(
       TabManager::IsInternalPage(GURL("chrome://settings/fakeSetting")));
 }
 
 // Ensures discarding tabs leaves TabStripModel in a good state.
 TEST_F(TabManagerTest, DiscardWebContentsAt) {
   TabManager tab_manager;
 
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
+  tabstrip.AddObserver(&tab_manager);
 
   // Fill it with some tabs.
   WebContents* contents1 = CreateWebContents();
   tabstrip.AppendWebContents(contents1, true);
   WebContents* contents2 = CreateWebContents();
   tabstrip.AppendWebContents(contents2, true);
 
   // Start watching for events after the appends to avoid observing state
   // transitions that aren't relevant to this test.
   MockTabStripModelObserver tabstrip_observer;
   tabstrip.AddObserver(&tabstrip_observer);
 
   // Discard one of the tabs.
   WebContents* null_contents1 = tab_manager.DiscardWebContentsAt(0, &tabstrip);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_TRUE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
   ASSERT_EQ(null_contents1, tabstrip.GetWebContentsAt(0));
   ASSERT_EQ(contents2, tabstrip.GetWebContentsAt(1));
   ASSERT_EQ(1, tabstrip_observer.NbEvents());
   EXPECT_EQ(contents1, tabstrip_observer.OldContents());
   EXPECT_EQ(null_contents1, tabstrip_observer.NewContents());
   tabstrip_observer.Reset();
 
   // Discard the same tab again, after resetting its discard state.
-  TabManager::WebContentsData::SetDiscardState(tabstrip.GetWebContentsAt(0),
-                                               false);
+  tab_manager.GetWebContentsData(tabstrip.GetWebContentsAt(0))
+      ->SetDiscardState(false);
   WebContents* null_contents2 = tab_manager.DiscardWebContentsAt(0, &tabstrip);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_TRUE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
   ASSERT_EQ(null_contents2, tabstrip.GetWebContentsAt(0));
   ASSERT_EQ(contents2, tabstrip.GetWebContentsAt(1));
   ASSERT_EQ(1, tabstrip_observer.NbEvents());
   EXPECT_EQ(null_contents1, tabstrip_observer.OldContents());
   EXPECT_EQ(null_contents2, tabstrip_observer.NewContents());
 
   // Activating the tab should clear its discard state.
   tabstrip.ActivateTabAt(0, true /* user_gesture */);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
 
   // Don't discard active tab.
   tab_manager.DiscardWebContentsAt(0, &tabstrip);
   ASSERT_EQ(2, tabstrip.count());
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.CloseAllTabs();
   EXPECT_TRUE(tabstrip.empty());
 }
 
 // Makes sure that reloading a discarded tab without activating it unmarks the
 // tab as discarded so it won't reload on activation.
 TEST_F(TabManagerTest, ReloadDiscardedTabContextMenu) {
+  // Note that we do not add |tab_manager| as an observer to |tabstrip| here as
+  // the event we are trying to test for is not related to the tab strip, but
+  // the web content instead and therefore should be handled by WebContentsData
+  // (which observes the web content).
   TabManager tab_manager;
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
 
   // Create 2 tabs because the active tab cannot be discarded.
   tabstrip.AppendWebContents(CreateWebContents(), true);
   content::WebContents* test_contents =
       WebContentsTester::CreateTestWebContents(browser_context(), nullptr);
   tabstrip.AppendWebContents(test_contents, false);  // Opened in background.
 
   // Navigate to a web page. This is necessary to set a current entry in memory
   // so the reload can happen.
   WebContentsTester::For(test_contents)
       ->NavigateAndCommit(GURL("chrome://newtab"));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tab_manager.DiscardWebContentsAt(1, &tabstrip);
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
+  EXPECT_TRUE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
 
   tabstrip.GetWebContentsAt(1)->GetController().Reload(false);
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tabstrip.GetWebContentsAt(1)));
-
+  EXPECT_FALSE(tab_manager.IsTabDiscarded(tabstrip.GetWebContentsAt(1)));
   tabstrip.CloseAllTabs();
   EXPECT_TRUE(tabstrip.empty());
 }
 
 // Makes sure that the last active time property is saved even though the tab is
 // discarded.
 TEST_F(TabManagerTest, DiscardedTabKeepsLastActiveTime) {
   TabManager tab_manager;
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
+  tabstrip.AddObserver(&tab_manager);
 
   tabstrip.AppendWebContents(CreateWebContents(), true);
   WebContents* test_contents = CreateWebContents();
   tabstrip.AppendWebContents(test_contents, false);
 
   // Simulate an old inactive tab about to get discarded.
   base::TimeTicks new_last_active_time =
       base::TimeTicks::Now() - base::TimeDelta::FromMinutes(35);
   test_contents->SetLastActiveTime(new_last_active_time);
   EXPECT_EQ(new_last_active_time, test_contents->GetLastActiveTime());
 
   WebContents* null_contents = tab_manager.DiscardWebContentsAt(1, &tabstrip);
   EXPECT_EQ(new_last_active_time, null_contents->GetLastActiveTime());
 
   tabstrip.CloseAllTabs();
   EXPECT_TRUE(tabstrip.empty());
 }
 
 }  // namespace memory