Speculative revert to see if this change introduced a performance regression on Mac intl perf bots.

chrome/browser/sessions/tab_restore_service_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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/render_view_test.h"
-#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
 using content::WebContentsTester;
 
 using content::NavigationEntry;
 
 // Create subclass that overrides TimeNow so that we can control the time used
 // for closed tabs and windows.
 class TabRestoreTimeFactory : public TabRestoreService::TimeFactory {
  public:
   TabRestoreTimeFactory() : time_(base::Time::Now()) {}
 
   virtual ~TabRestoreTimeFactory() {}
 
   virtual base::Time TimeNow() {
     return time_;
   }
 
  private:
   base::Time time_;
 };
 
 class TabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
  public:
-  TabRestoreServiceTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
+  TabRestoreServiceTest() {
     url1_ = GURL("http://1");
     url2_ = GURL("http://2");
     url3_ = GURL("http://3");
   }
 
   ~TabRestoreServiceTest() {
   }
 
  protected:
   // testing::Test overrides
@@ skipping 69 matching lines @@
     profile()->set_last_session_exited_cleanly(false);
   }
 
   GURL url1_;
   GURL url2_;
   GURL url3_;
   scoped_ptr<TabRestoreService> service_;
   TabRestoreTimeFactory* time_factory_;
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
       webkit_platform_support_;
-  content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(TabRestoreServiceTest, Basic) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   EXPECT_TRUE(tab->extension_app_id.empty());
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 
   NavigateToIndex(1);
 
   // And check again.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   // There should be two entries now.
   ASSERT_EQ(2U, service_->entries().size());
 
   // Make sure the entry matches
   entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_EQ(url1_, tab->navigations[0].virtual_url());
   EXPECT_EQ(url2_, tab->navigations[1].virtual_url());
   EXPECT_EQ(url3_, tab->navigations[2].virtual_url());
   EXPECT_EQ(1, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 }
 
 // Make sure TabRestoreService doesn't create an entry for a tab with no
 // navigations.
 TEST_F(TabRestoreServiceTest, DontCreateEmptyTab) {
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
   EXPECT_TRUE(service_->entries().empty());
 }
 
 // Tests restoring a single tab.
 TEST_F(TabRestoreServiceTest, Restore) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 }
 
 // Tests restoring a single pinned tab.
 TEST_F(TabRestoreServiceTest, RestorePinnedAndApp) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // We have to explicitly mark the tab as pinned as there is no browser for
   // these tests.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   tab->pinned = true;
@@ skipping 49 matching lines @@
 #endif  // defined(USE_AURA)
 
 // Make sure we persist entries to disk that have post data.
 TEST_F(TabRestoreServiceTest, DontPersistPostData) {
   AddThreeNavigations();
   controller().GetEntryAtIndex(0)->SetHasPostData(true);
   controller().GetEntryAtIndex(1)->SetHasPostData(true);
   controller().GetEntryAtIndex(2)->SetHasPostData(true);
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   const TabRestoreService::Entry* restored_entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
 
   const Tab* restored_tab =
       static_cast<const Tab*>(restored_entry);
   // There should be 3 navs.
   ASSERT_EQ(3U, restored_tab->navigations.size());
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
 }
 
 // Make sure we don't persist entries to disk that have post data. This
 // differs from DontPersistPostData1 in that all the navigations have post
 // data, so that nothing should be persisted.
 TEST_F(TabRestoreServiceTest, DontLoadTwice) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   service_->LoadTabsFromLastSession();
 
   // There should only be one entry.
   ASSERT_EQ(1U, service_->entries().size());
 }
@@ skipping 52 matching lines @@
 }
 
 TEST_F(TabRestoreServiceTest, LoadPreviousSessionAndTabs) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
   // The first entry should come from the session service.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
@@ skipping 22 matching lines @@
 
 // Make sure pinned state is correctly loaded from session service.
 TEST_F(TabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
   CreateSessionServiceWithOneWindow(true);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
   // The first entry should come from the session service.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
@@ skipping 23 matching lines @@
   CreateSessionServiceWithOneWindow(false);
 
   for (size_t i = 0; i < TabRestoreService::kMaxEntries; ++i)
     AddWindowWithOneTabToSessionService(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   RecreateService();
 
   // We should get back kMaxEntries entries. We added more, but
   // TabRestoreService only allows up to kMaxEntries.
   ASSERT_EQ(TabRestoreService::kMaxEntries, service_->entries().size());
 
   // The first entry should come from the session service.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(entry);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->selected_tab_index);
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
   ASSERT_EQ(1U, window->tabs[0].navigations.size());
   EXPECT_EQ(0, window->tabs[0].current_navigation_index);
   EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
   EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
 }
 
 // Makes sure we restore the time stamp correctly.
 TEST_F(TabRestoreServiceTest, TimestampSurvivesRestore) {
   base::Time tab_timestamp(base::Time::FromInternalValue(123456789));
 
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(contents(), -1);
+  service_->CreateHistoricalTab(&controller(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   tab->timestamp = tab_timestamp;
 
@@ skipping 107 matching lines @@
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
   const size_t max_entries = TabRestoreService::kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
-    service_->CreateHistoricalTab(contents(), -1);
+    service_->CreateHistoricalTab(&controller(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries_.size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries_.size());
 }