[GTTF] Miscellanous UI tests cleanups:

chrome/browser/session_history_uitest.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 "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
-using std::wstring;
-
 namespace {
 
 const wchar_t kDocRoot[] = L"chrome/test/data";
 
 class SessionHistoryTest : public UITest {
  protected:
   SessionHistoryTest() : UITest() {
     dom_automation_enabled_ = true;
   }
 
   virtual void SetUp() {
     UITest::SetUp();
 
     window_ = automation()->GetBrowserWindow(0);
     ASSERT_TRUE(window_.get());
 
-    int active_tab_index = -1;
-    ASSERT_TRUE(window_->GetActiveTabIndex(&active_tab_index));
-    tab_ = window_->GetTab(active_tab_index);
+    tab_ = window_->GetActiveTab();
     ASSERT_TRUE(tab_.get());
   }
 
   // Simulate clicking a link.  Only works on the frames.html testserver page.
   void ClickLink(std::string node_id) {
     GURL url("javascript:clickLink('" + node_id + "')");
     ASSERT_TRUE(tab_->NavigateToURL(url));
   }
 
   // Simulate filling in form data.  Only works on the frames.html page with
@@ skipping 12 matching lines @@
     GURL url("javascript:submitForm('" + node_id + "')");
     ASSERT_TRUE(tab_->NavigateToURL(url));
   }
 
   // Navigate session history using history.go(distance).
   void JavascriptGo(std::string distance) {
     GURL url("javascript:history.go('" + distance + "')");
     ASSERT_TRUE(tab_->NavigateToURL(url));
   }
 
-  wstring GetTabTitle() {
-    wstring title;
+  std::wstring GetTabTitle() {
+    std::wstring title;
     EXPECT_TRUE(tab_->GetTabTitle(&title));
     return title;
   }
 
   GURL GetTabURL() {
     GURL url;
     EXPECT_TRUE(tab_->GetCurrentURL(&url));
     return url;
   }
 
@@ skipping 468 matching lines @@
   ASSERT_TRUE(tab_->GoBack());
 
   // Ensure history.length is properly truncated.
   ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage("files/title2.html")));
   ASSERT_TRUE(tab_->ExecuteAndExtractInt(
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace