[ShareButtonInToolbar] add field trial for android experiment

Bug: 1036023
Change-Id: I4bb00ab9185e03b08ec1204f82049270f86eb214
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148242Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759359}

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/LocationBarLayoutTest.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.omnibox;
 
 import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
@@ -176,7 +175,7 @@ public class LocationBarLayoutTest {
     }
 
     private void setUrlBarTextAndFocus(String text) throws ExecutionException {
-        onView(withId(R.id.url_bar)).perform(click());
+        ClickUtils.clickButton(getUrlBar());
 
         TestThreadUtils.runOnUiThreadBlocking(new Callable<Void>() {
             @Override

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

@@ -73,7 +73,8 @@ public class IdentityDiscControllerTest {
         mActivityTestRule.startMainActivityWithURL(UrlConstants.NTP_URL);
         View experimentalButton =
                 mActivityTestRule.getActivity().findViewById(R.id.optional_toolbar_button);
-        Assert.assertNull("IdentityDisc is visible for signed out user", experimentalButton);
+        Assert.assertTrue("IdentityDisc is visible for signed out user",
+                experimentalButton == null || View.GONE == experimentalButton.getVisibility());
 
         // Identity Disc should be shown on sign-in state change without NTP refresh.
         SigninTestUtil.addAndSignInTestAccount();

testing/variations/fieldtrial_testing_config.json

@@ -5301,6 +5301,21 @@
             ]
         }
     ],
+    "ShareButtonInTopToolbar": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled",
+                    "enable_features": [
+                        "ShareButtonInTopToolbar"
+                    ]
+                }
+            ]
+        }
+    ],
     "SharedClipboard": [
         {
             "platforms": [