Convert the last remaining find bar ui test to a browser test. Also convert...

Convert the last remaining find bar ui test to a browser test. Also convert all the find bar tests to just use file urls instead of the http server, which is faster (I didn't see a reason to use http).

BUG=121574, 45753
Review URL: https://chromiumcodereview.appspot.com/10188003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133518 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/find_bar_host_uitest.cc

-// Copyright (c) 2012 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 "chrome/app/chrome_command_ids.h"
-#include "chrome/test/automation/automation_proxy.h"
-#include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/ui/ui_test.h"
-#include "net/test/test_server.h"
-
-class FindInPageControllerTest : public UITest {
- public:
-  FindInPageControllerTest() {
-    show_window_ = true;
-  }
-};
-
-const std::string kSimplePage = "404_is_enough_for_us.html";
-
-#if !defined(OS_WIN)
-// Has never been enabled on other platforms http://crbug.com/45753
-#define FindMovesOnTabClose_Issue1343052 \
-    DISABLED_FindMovesOnTabClose_Issue1343052
-#endif
-// The find window should not change its location just because we open and close
-// a new tab.
-TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
-  net::TestServer test_server(net::TestServer::TYPE_HTTP,
-                              net::TestServer::kLocalhost,
-                              FilePath(FILE_PATH_LITERAL("chrome/test/data")));
-  ASSERT_TRUE(test_server.Start());
-
-  GURL url = test_server.GetURL(kSimplePage);
-  scoped_refptr<TabProxy> tabA(GetActiveTab());
-  ASSERT_TRUE(tabA.get());
-  ASSERT_TRUE(tabA->NavigateToURL(url));
-  WaitUntilTabCount(1);
-
-  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-  ASSERT_TRUE(browser.get() != NULL);
-
-  // Toggle the bookmark bar state.
-  EXPECT_TRUE(browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR));
-  EXPECT_TRUE(WaitForBookmarkBarVisibilityChange(browser.get(), true));
-
-  // Open the Find window and wait for it to animate.
-  EXPECT_TRUE(browser->OpenFindInPage());
-  EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), true));
-
-  // Find its location.
-  int x = -1, y = -1;
-  EXPECT_TRUE(browser->GetFindWindowLocation(&x, &y));
-
-  // Open another tab (tab B).
-  EXPECT_TRUE(browser->AppendTab(url));
-  scoped_refptr<TabProxy> tabB(GetActiveTab());
-  ASSERT_TRUE(tabB.get());
-
-  // Close tab B.
-  EXPECT_TRUE(tabB->Close(true));
-
-  // See if the Find window has moved.
-  int new_x = -1, new_y = -1;
-  EXPECT_TRUE(browser->GetFindWindowLocation(&new_x, &new_y));
-
-  EXPECT_EQ(x, new_x);
-  EXPECT_EQ(y, new_y);
-
-  // Now reset the bookmark bar state and try the same again.
-  EXPECT_TRUE(browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR));
-  EXPECT_TRUE(WaitForBookmarkBarVisibilityChange(browser.get(), false));
-
-  // Bookmark bar has moved, reset our coordinates.
-  EXPECT_TRUE(browser->GetFindWindowLocation(&x, &y));
-
-  // Open another tab (tab C).
-  EXPECT_TRUE(browser->AppendTab(url));
-  scoped_refptr<TabProxy> tabC(GetActiveTab());
-  ASSERT_TRUE(tabC.get());
-
-  // Close it.
-  EXPECT_TRUE(tabC->Close(true));
-
-  // See if the Find window has moved.
-  EXPECT_TRUE(browser->GetFindWindowLocation(&new_x, &new_y));
-
-  EXPECT_EQ(x, new_x);
-  EXPECT_EQ(y, new_y);
-}

chrome/chrome_tests.gypi

@@ -717,7 +717,6 @@
         'browser/process_singleton_linux_uitest.cc',
         'browser/sessions/session_restore_uitest.cc',
         'browser/ui/tests/browser_uitest.cc',
-        'browser/ui/views/find_bar_host_uitest.cc',
         'browser/ui/webui/bookmarks_ui_uitest.cc',
         'browser/ui/webui/ntp/new_tab_ui_uitest.cc',
         'browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc',