Revert 56834 - Fix a few test failures when landing http://trac.webkit.org/ch...

chrome/browser/history/redirect_uitest.cc

 // Copyright (c) 2010 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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/file_util.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/view_ids.h"
-#include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
-#include "views/event.h"
 
 namespace {
 
 class RedirectTest : public UITest {
  public:
   RedirectTest()
       : test_server_(net::TestServer::TYPE_HTTP,
                      FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
   }
 
@@ skipping 68 matching lines @@
   std::vector<GURL> redirects;
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
   ASSERT_EQ(1U, redirects.size());
   EXPECT_EQ(final_url.spec(), redirects[0].spec());
 }
 
 // Tests to make sure a location change when a pending redirect exists isn't
 // flagged as a redirect.
-#if defined(OS_WIN) || defined(OS_LINUX)
-// SimulateOSClick is broken on the Mac: http://crbug.com/45162
 TEST_F(RedirectTest, ClientCancelled) {
   FilePath first_path(test_data_directory_);
   first_path = first_path.AppendASCII("cancelled_redirect_test.html");
   ASSERT_TRUE(file_util::AbsolutePath(&first_path));
   GURL first_url = net::FilePathToFileURL(first_path);
 
   NavigateToURLBlockUntilNavigationsComplete(first_url, 1);
 
-  scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
-  ASSERT_TRUE(browser.get());
-  scoped_refptr<WindowProxy> window = browser->GetWindow();
-  ASSERT_TRUE(window.get());
+  NavigateToURL(GURL("javascript:click()")); // User initiated location change.
+
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
-  int64 last_nav_time = 0;
-  EXPECT_TRUE(tab_proxy->GetLastNavigationTime(&last_nav_time));
-  // Simulate a click to force to make a user-initiated location change;
-  // otherwise, a non user-initiated in-page location change will be treated
-  // as client redirect and the redirect will be recoreded, which can cause
-  // this test failed.
-  gfx::Rect tab_view_bounds;
-  ASSERT_TRUE(browser->BringToFront());
-  ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &tab_view_bounds,
-                                    true));
-  ASSERT_TRUE(
-      window->SimulateOSClick(tab_view_bounds.CenterPoint(),
-                              views::Event::EF_LEFT_BUTTON_DOWN));
-  EXPECT_TRUE(tab_proxy->WaitForNavigation(last_nav_time));
 
   std::vector<GURL> redirects;
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
 
   // There should be no redirects from first_url, because the anchor location
   // change that occurs should not be flagged as a redirect and the meta-refresh
   // won't have fired yet.
   ASSERT_EQ(0U, redirects.size());
   GURL current_url;
   ASSERT_TRUE(tab_proxy->GetCurrentURL(&current_url));
 
   // Need to test final path and ref separately since constructing a file url
   // containing an anchor using FilePathToFileURL will escape the anchor as
   // %23, but in current_url the anchor will be '#'.
   std::string final_ref = "myanchor";
   FilePath current_path;
   ASSERT_TRUE(net::FileURLToFilePath(current_url, &current_path));
   ASSERT_TRUE(file_util::AbsolutePath(&current_path));
   // Path should remain unchanged.
   EXPECT_EQ(StringToLowerASCII(first_path.value()),
             StringToLowerASCII(current_path.value()));
   EXPECT_EQ(final_ref, current_url.ref());
 }
-#endif
 
 // Tests a client->server->server redirect
 TEST_F(RedirectTest, ClientServerServer) {
   ASSERT_TRUE(test_server_.Start());
 
   GURL final_url = test_server_.GetURL(std::string());
   GURL next_to_last = test_server_.GetURL(
       "server-redirect?" + final_url.spec());
   GURL second_url = test_server_.GetURL(
       "server-redirect?" + next_to_last.spec());
@@ skipping 133 matching lines @@
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
 
 }  // namespace