[GTTF] Miscellanous UI tests cleanups:

chrome/browser/tab_restore_uitest.cc

 // Copyright (c) 2006-2009 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
@@ skipping 80 matching lines @@
     // Ensure that the tab and window are active.
     CheckActiveWindow(browser_proxy.get());
     EXPECT_EQ(expected_tabstrip_index,
         GetActiveTabIndex(expected_window_index));
   }
 
   // Adds tabs to the given browser, all navigated to url1_. Returns
   // the final number of tabs.
   int AddSomeTabs(BrowserProxy* browser, int how_many) {
     int starting_tab_count = -1;
-    // Use EXPECT instead of ASSERT throughout to avoid trying to return void.
     EXPECT_TRUE(browser->GetTabCount(&starting_tab_count));
 
     for (int i = 0; i < how_many; ++i) {
       EXPECT_TRUE(browser->AppendTab(url1_));
-      int current_tab_count;
-      EXPECT_TRUE(browser->GetTabCount(&current_tab_count));
-      EXPECT_EQ(starting_tab_count + i + 1, current_tab_count);
     }
     int tab_count;
     EXPECT_TRUE(browser->GetTabCount(&tab_count));
     EXPECT_EQ(starting_tab_count + how_many, tab_count);
     return tab_count;
   }
 
   // Ensure that the given browser occupies the currently active window.
   void CheckActiveWindow(const BrowserProxy* browser) {
     // This entire check is disabled because even the IsActive() call
@@ skipping 487 matching lines @@
   GURL url;
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url1_);
 
   restored_tab_proxy = browser_proxy->GetTab(initial_tab_count + 1);
   ASSERT_TRUE(restored_tab_proxy.get());
   ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url2_);
 }