summaryrefslogtreecommitdiffstats
path: root/sync/android
diff options
context:
space:
mode:
authoraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 19:28:13 +0000
committeraurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 19:28:13 +0000
commit6f221ce75d467f34aaf57ceab5216f2884bb082a (patch)
tree071d4ca764845c63a0698609535101c23b8c9843 /sync/android
parentae454be777000ccb6eb13785bdbd60c0433be7e6 (diff)
downloadchromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.zip
chromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.tar.gz
chromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.tar.bz2
Fixing all Java import ordering issues.
BUG=320711 TBR=isherman@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/110963003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/android')
-rw-r--r--sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java1
-rw-r--r--sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java2
-rw-r--r--sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java7
-rw-r--r--sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java1
-rw-r--r--sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java1
5 files changed, 4 insertions, 8 deletions
diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
index 24a77cd..87dc88a 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
+++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java
@@ -22,7 +22,6 @@ import com.google.protos.ipc.invalidation.Types.ClientType;
import org.chromium.base.ActivityStatus;
import org.chromium.base.CollectionUtil;
import org.chromium.sync.internal_api.pub.base.ModelType;
-import org.chromium.sync.notifier.InvalidationIntentProtocol;
import org.chromium.sync.notifier.InvalidationPreferences.EditContext;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.sync.signin.ChromeSigninController;
diff --git a/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java b/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
index 6374f51..171fa51 100644
--- a/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
+++ b/sync/android/java/src/org/chromium/sync/notifier/RandomizedInvalidationClientNameGenerator.java
@@ -6,8 +6,6 @@ package org.chromium.sync.notifier;
import android.util.Base64;
-import org.chromium.sync.notifier.InvalidationClientNameGenerator;
-
import java.util.Random;
/**
diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
index 1a6f34c..99dc0bb 100644
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
+++ b/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java
@@ -5,8 +5,6 @@
package org.chromium.sync.signin;
-import com.google.common.annotations.VisibleForTesting;
-
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerFuture;
@@ -20,14 +18,17 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
+import com.google.common.annotations.VisibleForTesting;
+
import org.chromium.base.ThreadUtils;
import org.chromium.net.NetworkChangeNotifier;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.List;
+
import javax.annotation.Nullable;
/**
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
index d24aa89..a6835e4 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
@@ -8,7 +8,6 @@ import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.test.util.Feature;
-import org.chromium.sync.notifier.InvalidationClientNameProvider;
import java.util.Arrays;
diff --git a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
index fcdc65e..5c36bfd 100644
--- a/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
+++ b/sync/android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
@@ -21,7 +21,6 @@ import org.chromium.base.CollectionUtil;
import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.base.test.util.Feature;
import org.chromium.sync.internal_api.pub.base.ModelType;
-import org.chromium.sync.notifier.InvalidationIntentProtocol;
import org.chromium.sync.notifier.InvalidationPreferences.EditContext;
import org.chromium.sync.signin.AccountManagerHelper;