Upstream oodles of Chrome for Android code into Chromium.

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..96e73ad779e13f41b4150599a79233352afcb219
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/ToolbarTest.java
@@ -0,0 +1,71 @@
+// Copyright 2015 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.
+
+package org.chromium.chrome.browser.toolbar;
+
+import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_TABLET;
+
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.google.android.apps.chrome.R;
+
+import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.omnibox.UrlBar;
+import org.chromium.chrome.browser.widget.findinpage.FindToolbar;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.util.MenuUtils;
+import org.chromium.chrome.test.util.OmniboxTestUtils;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+
+/**
+ * Tests for toolbar manager behavior.
+ */
+public class ToolbarTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+    public ToolbarTest() {
+        super(ChromeActivity.class);
+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+
+    private void findInPageFromMenu() throws InterruptedException {
+        MenuUtils.invokeCustomMenuActionSync(getInstrumentation(),
+                getActivity(), R.id.find_in_page_id);
+
+        waitForFindInPageVisibility(true);
+    }
+
+    private void waitForFindInPageVisibility(final boolean visible) throws InterruptedException {
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                FindToolbar findToolbar = (FindToolbar) getActivity().findViewById(
+                        R.id.find_toolbar);
+
+                boolean isVisible = findToolbar != null && findToolbar.isShown();
+                return (visible == isVisible) && !findToolbar.isAnimating();
+            }
+        }));
+    }
+
+    @MediumTest
+    @Restriction(RESTRICTION_TYPE_TABLET)
+    @Feature({"Omnibox"})
+    public void testFindInPageDismissedOnOmniboxFocus() throws InterruptedException {
+        findInPageFromMenu();
+
+        UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+        OmniboxTestUtils.toggleUrlBarFocus(urlBar, true);
+        OmniboxTestUtils.waitForFocusAndKeyboardActive(urlBar, true);
+
+        waitForFindInPageVisibility(false);
+    }
+
+}