Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Unified Diff: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java

Issue 168833004: [sync] Fix sync tests for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « chrome/android/testshell/javatests/AndroidManifest.xml ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
index 08d2a09312a0055cb95ba9d32feef89b0ba5580d..878de6d4505dd4f0027f499b159867bc583d65b0 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
@@ -36,6 +36,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+/**
+ * Utility class for shared sync test functionality.
+ */
public final class SyncTestUtil {
public static final String DEFAULT_TEST_ACCOUNT = "test@gmail.com";
@@ -44,6 +47,8 @@ public final class SyncTestUtil {
"oauth2:https://www.googleapis.com/auth/chromesync";
public static final String LOGIN_OAUTH2_SCOPE =
"oauth2:https://www.google.com/accounts/OAuthLogin";
+ public static final String USERINFO_SCOPE =
+ "oauth2:https://www.googleapis.com/auth/userinfo.profile";
private static final String TAG = "SyncTestUtil";
public static final long UI_TIMEOUT_MS = scaleTimeout(20000);
@@ -329,6 +334,12 @@ public final class SyncTestUtil {
verifySignedInWithAccount(context, account);
}
+ /**
+ * Retrieves the sync internals information which is the basis for chrome://sync-internals and
+ * makes the result available in {@link AboutSyncInfoGetter#getAboutInfo()}.
+ *
+ * This class has to be run on the main thread, as it accesses the ProfileSyncService.
+ */
public static class AboutSyncInfoGetter implements Runnable {
private static final String TAG = "AboutSyncInfoGetter";
final Context mContext;
« no previous file with comments | « chrome/android/testshell/javatests/AndroidManifest.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698