Merge 13131 - Make the throbber throb sooner after you navigate. This fixes t...

chrome/browser/tabs/tab_strip_model_unittest.cc

 // Copyright (c) 2006-2008 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/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
@@ skipping 256 matching lines @@
     s->src_index = from_index;
     states_.push_back(s);
   }
 
   virtual void TabClosingAt(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, CLOSE));
   }
   virtual void TabDetachedAt(TabContents* contents, int index) {
     states_.push_back(new State(contents, index, DETACH));
   }
-  virtual void TabChangedAt(TabContents* contents, int index) {
+  virtual void TabChangedAt(TabContents* contents, int index,
+                            bool loading_only) {
     states_.push_back(new State(contents, index, CHANGE));
   }
   virtual void TabStripEmpty() {
     empty_ = true;
   }
 
   void ClearStates() {
     STLDeleteContainerPointers(states_.begin(), states_.end());
     states_.clear();
   }
@@ skipping 170 matching lines @@
     EXPECT_EQ(contents1, tabstrip.GetTabContentsAt(1));
     EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(replacement_contents2));
     EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1));
     EXPECT_EQ(0, tabstrip.GetIndexOfController(
         replacement_contents2->controller()));
     EXPECT_EQ(1, tabstrip.GetIndexOfController(contents1->controller()));
   }
 
   // Test UpdateTabContentsStateAt
   {
-    tabstrip.UpdateTabContentsStateAt(0);
+    tabstrip.UpdateTabContentsStateAt(0, false);
     EXPECT_EQ(1, observer.GetStateCount());
     State s1(replacement_contents2, 0, MockTabStripModelObserver::CHANGE);
     EXPECT_TRUE(observer.StateEquals(0, s1));
     observer.ClearStates();
   }
 
   // Test SelectNextTab, SelectPreviousTab, SelectLastTab
   {
     // Make sure the second of the two tabs is selected first...
     tabstrip.SelectTabContentsAt(1, true);
@@ skipping 808 matching lines @@
 
   // Now select the last tab.
   strip.SelectTabContentsAt(strip.count() - 1, true);
 
   // Now close the last tab. The next adjacent should be selected.
   strip.CloseTabContentsAt(strip.count() - 1);
   EXPECT_EQ(page_d_contents, strip.GetTabContentsAt(strip.selected_index()));
 
   strip.CloseAllTabs();
 }