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

chrome/browser/memory/tab_manager_browsertest.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 "base/command_line.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/memory/tab_manager.h"
 #include "chrome/browser/memory/tab_manager_web_contents_data.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 77 matching lines @@
                       ui::PAGE_TRANSITION_TYPED, false);
   browser()->OpenURL(open5);
   load5.Wait();
 
   EXPECT_EQ(3, tsm->count());
 
   // Discard a tab.  It should kill the first tab, since it was the oldest
   // and was not selected.
   EXPECT_TRUE(tab_manager->DiscardTab());
   EXPECT_EQ(3, tsm->count());
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
   EXPECT_TRUE(tab_manager->recent_tab_discard());
 
   // Run discard again, make sure it kills the second tab.
   EXPECT_TRUE(tab_manager->DiscardTab());
   EXPECT_EQ(3, tsm->count());
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(0)));
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Kill the third tab. It should not kill the last tab, since it is active
   // tab.
   EXPECT_FALSE(tab_manager->DiscardTab());
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(0)));
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Kill the third tab after making second tab active.
   tsm->ActivateTabAt(1, true);
   EXPECT_EQ(1, tsm->active_index());
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
   tab_manager->DiscardWebContentsAt(2, tsm);
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Force creation of the FindBarController.
   browser()->GetFindBarController();
 
   // Select the first tab.  It should reload.
   WindowedNotificationObserver reload1(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::SelectNumberedTab(browser(), 0);
   reload1.Wait();
   // Make sure the FindBarController gets the right WebContents.
   EXPECT_EQ(browser()->GetFindBarController()->web_contents(),
             tsm->GetActiveWebContents());
   EXPECT_EQ(0, tsm->active_index());
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
-  EXPECT_TRUE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_TRUE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Select the third tab. It should reload.
   WindowedNotificationObserver reload2(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::SelectNumberedTab(browser(), 2);
   reload2.Wait();
   EXPECT_EQ(2, tsm->active_index());
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(0)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(1)));
-  EXPECT_FALSE(
-      TabManager::WebContentsData::IsDiscarded(tsm->GetWebContentsAt(2)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(0)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(1)));
+  EXPECT_FALSE(tab_manager->IsTabDiscarded(tsm->GetWebContentsAt(2)));
 
   // Navigate the third tab back twice.  We used to crash here due to
   // crbug.com/121373.
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   EXPECT_FALSE(chrome::CanGoForward(browser()));
   WindowedNotificationObserver back1(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   chrome::GoBack(browser(), CURRENT_TAB);
   back1.Wait();
@@ skipping 51 matching lines @@
     base::RunLoop().RunUntilIdle();
     if (tab_manager->recent_tab_discard())
       break;
   }
   EXPECT_TRUE(tab_manager->recent_tab_discard());
 }
 
 }  // namespace memory
 
 #endif  // OS_WIN || OS_CHROMEOS