summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/automation/automation_provider.cc4
-rw-r--r--chrome/browser/views/find_bar_win_uitest.cc5
2 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 56003de..599a553 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1746,7 +1746,7 @@ void AutomationProvider::GetFindWindowVisibility(const IPC::Message& message,
bool visible = false;
WebContents* web_contents = GetWebContentsForHandle(handle, NULL);
if (web_contents)
- visible = web_contents->view()->GetFindBarWindowInfo(&position, &visible);
+ web_contents->view()->GetFindBarWindowInfo(&position, &visible);
Send(new AutomationMsg_FindWindowVisibilityResponse(message.routing_id(),
visible));
@@ -1758,7 +1758,7 @@ void AutomationProvider::HandleFindWindowLocationRequest(
bool visible = false;
WebContents* web_contents = GetWebContentsForHandle(handle, NULL);
if (web_contents)
- visible = web_contents->view()->GetFindBarWindowInfo(&position, &visible);
+ web_contents->view()->GetFindBarWindowInfo(&position, &visible);
Send(new AutomationMsg_FindWindowLocationResponse(message.routing_id(),
position.x(),
diff --git a/chrome/browser/views/find_bar_win_uitest.cc b/chrome/browser/views/find_bar_win_uitest.cc
index 0e04274..7844a55 100644
--- a/chrome/browser/views/find_bar_win_uitest.cc
+++ b/chrome/browser/views/find_bar_win_uitest.cc
@@ -155,11 +155,6 @@ TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
// Open the Find window and wait for it to animate.
fprintf(stderr, "OpenFindInPage in A\n");
EXPECT_TRUE(tabA->OpenFindInPage());
- // TODO(brettw) fix this! It appears that WaitForFindWindowFullyVisible is
- // broken somehow, and we're getting incorrect values here, probably as a
- // result of the animation. Waiting some extra time seems to make this test
- // pass.
- Sleep(1000);
fprintf(stderr, "WaitForWindowFullyVisible in A\n");
EXPECT_TRUE(WaitForFindWindowFullyVisible(tabA.get()));