Removing AtomicReference using ThreadUtils

chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java
index 5188070fe3478025b0cd7d6572c5c3fc11ab4b6d..ad9722d90e1fc932925c3a038686d5ff19396875 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmark/ManageBookmarkActivityTest.java
@@ -11,6 +11,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
@@ -26,7 +27,7 @@ import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 
 import java.util.Locale;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.Callable;
 
 /**
  * Tests the ManageBookmarkActivity, which allows users to add and edit bookmarks.
@@ -69,16 +70,16 @@ public class ManageBookmarkActivityTest extends ChromeTabbedActivityTestBase {
 
     private void assertFolderText(final AddEditBookmarkFragment addEditFragment,
             String expectedText) {
-        final AtomicReference<String> actualTextContainer = new AtomicReference<String>();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                Button button = (Button) addEditFragment.getView().findViewById(
-                        R.id.bookmark_folder_select);
-                actualTextContainer.set(button.getText().toString());
-            }
-        });
-        assertEquals(expectedText, actualTextContainer.get());
+        String actualTextContainer = ThreadUtils.runOnUiThreadBlockingNoException(
+                new Callable<String>() {
+                    @Override
+                    public String call() {
+                        Button button = (Button) addEditFragment.getView().findViewById(
+                                R.id.bookmark_folder_select);
+                        return button.getText().toString();
+                    }
+                });
+        assertEquals(expectedText, actualTextContainer);
     }
 
     @SmallTest