[GTTF] Various ui tests cleanups:

chrome/browser/browser_encoding_uitest.cc

Index: chrome/browser/browser_encoding_uitest.cc
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index c5c3eb7a8c3f0582fba229c95cf987b8aecd9f20..5ed496cd975ec755014b71c6da4ba86887f18658 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -92,18 +92,16 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
   };
   const char* const kAliasTestDir = "alias_mapping";
 
+  scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
+  ASSERT_TRUE(tab_proxy.get());
+
   FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kAliasTestDir);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kEncodingTestDatas); ++i) {
     FilePath test_file_path(test_dir_path);
     test_file_path = test_file_path.AppendASCII(
         kEncodingTestDatas[i].file_name);
-    GURL url =
-        URLRequestMockHTTPJob::GetMockUrl(test_file_path);
 
-    scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
-    ASSERT_TRUE(tab_proxy.get());
-    ASSERT_TRUE(tab_proxy->NavigateToURL(url));
-    WaitUntilTabCount(1);
+    NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(test_file_path));
 
     std::string encoding;
     EXPECT_TRUE(tab_proxy->GetPageCurrentEncoding(&encoding));
@@ -253,7 +251,6 @@ TEST_F(BrowserEncodingTest, TestEncodingAutoDetect) {
     GURL url =
         URLRequestMockHTTPJob::GetMockUrl(test_file_path);
     ASSERT_TRUE(tab->NavigateToURL(url));
-    WaitUntilTabCount(1);
 
     // Disable auto detect if it is on.
     EXPECT_TRUE(