content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java - Issue 196193002: Implement ScreenOrientationProvider for Chrome Android.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java

Issue 196193002: Implement ScreenOrientationProvider for Chrome Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/screen_orientation/screen_orientation_provider_android.h ('K') | « content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java

index 2b3bfdcb7e1f3698df421a78735e95c969c5f395..f75203ebe626ae368269c40815f20f154334dce1 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java

@@ -11,9 +11,9 @@ import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content.browser.ScreenOrientationListener.ScreenOrientationObserver;

-import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

+import org.chromium.content.browser.test.util.MockOrientationObserver;

+import org.chromium.content.browser.test.util.OrientationChangeObserverCriteria;

import org.chromium.content_shell_apk.ContentShellActivity;

import org.chromium.content_shell_apk.ContentShellTestBase;

@@ -29,60 +29,7 @@ public class ScreenOrientationListenerTest extends ContentShellTestBase {

private static final String DEFAULT_URL =

UrlUtils.encodeHtmlDataUri("<html><body>foo</body></html>");

- private static class OrientationObserver

- implements ScreenOrientationObserver {

- public int mOrientation = -1;

- public boolean mHasChanged = false;

- @Override

- public void onScreenOrientationChanged(int orientation) {

- mOrientation = orientation;

- mHasChanged = true;

- }

- /**

- * Criteria used to know when an orientation change happens.

- */

- private static class OrientationChangeObserverCriteria implements Criteria {

- private final OrientationObserver mObserver;

- private final int mTarget;

- private final boolean mCheckTarget;

- // Constructor to be used when the criteria is that there is an

- // orientation change but the new orientation value does not matter.

- private OrientationChangeObserverCriteria(

- OrientationObserver observer) {

- mObserver = observer;

- mObserver.mHasChanged = false;

- mCheckTarget = false;

- mTarget = -1;

- }

- // Constructor to be used when the criteria cares about a change

- // happening to a specific orientation value.

- private OrientationChangeObserverCriteria(

- OrientationObserver observer, int target) {

- mObserver = observer;

- mObserver.mHasChanged = false;

- mTarget = target;

- mCheckTarget = true;

- }

- @Override

- public boolean isSatisfied() {

- if (!mObserver.mHasChanged)

- return false;

- return !mCheckTarget || mObserver.mOrientation == mTarget;

- }

- private OrientationObserver mObserver;

+ private MockOrientationObserver mObserver;

/**

* Returns the expected orientation angle based on the orientation type.

@@ -136,7 +83,7 @@ public class ScreenOrientationListenerTest extends ContentShellTestBase {

public void setUp() throws Exception {

super.setUp();

- mObserver = new OrientationObserver();

+ mObserver = new MockOrientationObserver();

}

@Override