Revert 67849 - Figure out error in test PrepopulateRespectBlank....

chrome/browser/ui/views/find_bar_host_interactive_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.
 
 #include "app/keyboard_codes.h"
-#include "base/process_util.h"
-#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/views/find_bar_host.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/test/test_server.h"
 #include "views/focus/focus_manager.h"
 #include "views/view.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <Psapi.h>
-#endif
-
 namespace {
 
 // The delay waited after sending an OS simulated event.
 static const int kActionDelayMs = 500;
 static const char kSimplePage[] = "files/find_in_page/simple.html";
 
 class FindInPageTest : public InProcessBrowserTest {
  public:
   FindInPageTest() {
     set_show_window(true);
     FindBarHost::disable_animations_during_testing_ = true;
   }
 
   string16 GetFindBarText() {
     FindBarTesting* find_bar =
         browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindText();
   }
 };
 
 void Checkpoint(const char* message, const base::TimeTicks& start_time) {
   LOG(INFO) << message << " : "
     << (base::TimeTicks::Now() - start_time).InMilliseconds()
     << " ms" << std::flush;
 }
 
-// Test to make sure Chrome is in the foreground as we start testing. This is
-// required for tests that synthesize input to the Chrome window.
-bool ChromeInForeground() {
-#if defined(OS_WIN)
-  HWND window = ::GetForegroundWindow();
-  std::wstring caption;
-  std::wstring filename;
-  int len = ::GetWindowTextLength(window) + 1;
-  ::GetWindowText(window, WriteInto(&caption, len), len);
-  bool chrome_window_in_foreground =
-      (caption == L"about:blank - Google Chrome");
-  if (!chrome_window_in_foreground) {
-    DWORD process_id;
-    int thread_id = ::GetWindowThreadProcessId(window, &process_id);
-
-    base::ProcessHandle process;
-    if (base::OpenProcessHandleWithAccess(process_id,
-                                          PROCESS_QUERY_LIMITED_INFORMATION,
-                                          &process)) {
-      len = MAX_PATH;
-      if (!GetProcessImageFileName(process, WriteInto(&filename, len), len)) {
-        int error = GetLastError();
-        filename = L"Unable to read filename (error " +
-                   base::IntToString16(error) + L")";
-      }
-      base::CloseProcessHandle(process);
-    }
-  }
-  EXPECT_TRUE(chrome_window_in_foreground)
-      << "Chrome must be in the foreground when running interactive tests\n"
-      << "Process in foreground: " << filename.c_str();
-  return chrome_window_in_foreground;
-#else
-  // Windows only at the moment.
-  return true;
-#endif
-}
-
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
   ASSERT_TRUE(test_server()->Start());
 
   // First we navigate to our test page (tab A).
   GURL url = test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->Find();
@@ skipping 69 matching lines @@
 }
 
 // This tests that whenever you clear values from the Find box and close it that
 // it respects that and doesn't show you the last search, as reported in bug:
 // http://crbug.com/40121.
 IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
+
   base::TimeTicks start_time = base::TimeTicks::Now();
   Checkpoint("Starting test server", start_time);
 
   ASSERT_TRUE(test_server()->Start());
 
-  // Make sure Chrome is in the foreground, otherwise sending input
-  // won't do anything and the test will hang.
-  ASSERT_TRUE(ChromeInForeground());
-
   // First we navigate to any page.
   Checkpoint("Navigating", start_time);
   GURL url = test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Show the Find bar.
   Checkpoint("Showing Find window", start_time);
   browser()->GetFindBarController()->Show();
 
   // Search for "a".
@@ skipping 38 matching lines @@
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), app::VKEY_F3, false, false, false, false));
 
   // After the Find box has been reopened, it should still have no prepopulate
   // value.
   Checkpoint("GetFindBarText", start_time);
   EXPECT_EQ(string16(), GetFindBarText());
 
   Checkpoint("Test completed", start_time);
 }