| Index: content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
|
| index 0a95dbd2d145e3336a76ca7da4eda0f48f7953ef..1e8709caeba686c13634492cf9d4364e23511f6a 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
|
| @@ -116,7 +116,7 @@ public class ScreenOrientationProviderTest extends ContentShellTestBase {
|
| getInstrumentation().waitForIdleSync();
|
|
|
| try {
|
| - CriteriaHelper.pollForCriteria(criteria);
|
| + CriteriaHelper.pollInstrumentationThread(criteria);
|
| } catch (AssertionError e) {
|
| // This should not be here but the Criteria does not support cases where the orientation
|
| // is not being changed (i.e. where the Natural orientation matches the one you are
|
| @@ -152,7 +152,7 @@ public class ScreenOrientationProviderTest extends ContentShellTestBase {
|
|
|
| // Make sure mObserver is updated before we start the tests.
|
| try {
|
| - CriteriaHelper.pollForCriteria(criteria);
|
| + CriteriaHelper.pollInstrumentationThread(criteria);
|
| } catch (AssertionError e) {
|
| // This should not be here but the Criteria does not support cases where the orientation
|
| // is not being changed (i.e. where the Natural orientation matches the one you are
|
|
|