[GTTF] Various ui tests cleanups:

chrome/browser/browser_encoding_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 <string>
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/pref_names.h"
@@ skipping 74 matching lines @@
     { "windows-1252.html", "windows-1252" },
     { "windows-1253.html", "windows-1253" },
     { "windows-1254.html", "windows-1254" },
     { "windows-1255.html", "windows-1255" },
     { "windows-1256.html", "windows-1256" },
     { "windows-1257.html", "windows-1257" },
     { "windows-1258.html", "windows-1258" }
   };
   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));
     EXPECT_EQ(encoding, kEncodingTestDatas[i].encoding_name);
   }
 }
 
 #if defined(OS_WIN)
 // We are disabling this test on MacOS and Linux because on those platforms
 // AutomationProvider::OverrideEncoding is not implemented yet.
@@ skipping 129 matching lines @@
                                            L"ISO-8859-4"));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas);i++) {
     FilePath test_file_path(test_dir_path);
     test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
     GURL url =
         URLRequestMockHTTPJob::GetMockUrl(test_file_path);
     ASSERT_TRUE(tab->NavigateToURL(url));
-    WaitUntilTabCount(1);
 
     // Disable auto detect if it is on.
     EXPECT_TRUE(
         browser->SetBooleanPreference(prefs::kWebKitUsesUniversalDetector,
                                       false));
     EXPECT_TRUE(tab->Reload());
 
     // Get the encoding used for the page, it must be the default charset we
     // just set.
     std::string encoding;
@@ skipping 22 matching lines @@
     expected_result_file_name = expected_result_file_name.AppendASCII(
         kExpectedResultDir);
     expected_result_file_name = expected_result_file_name.AppendASCII(
         kTestDatas[i].expected_result);
     EXPECT_TRUE(tab->SavePage(full_saved_file_name, temp_sub_resource_dir_,
                               SavePackage::SAVE_AS_COMPLETE_HTML));
     EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
     CheckFile(full_saved_file_name, expected_result_file_name, true);
   }
 }