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

Unified Diff: components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/AccountHolder.java

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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
Index: components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/AccountHolder.java
diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java b/components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/AccountHolder.java
similarity index 93%
rename from sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
rename to components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/AccountHolder.java
index 34b52e912118b7bcd4b27759705bc811181fccc1..80d23864140febdccc9816f9c32ad9c3b7f5bfab 100644
--- a/sync/test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java
+++ b/components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/AccountHolder.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.sync.test.util;
+package org.chromium.components.sync.test.util;
import android.accounts.Account;
import android.os.Handler;
@@ -21,7 +21,6 @@ import javax.annotation.Nullable;
* account, such as its password and set of granted auth tokens.
*/
public class AccountHolder {
-
private final Account mAccount;
private final String mPassword;
@@ -45,8 +44,8 @@ public class AccountHolder {
mAccount = account;
mPassword = password;
mAuthTokens = authTokens == null ? new HashMap<String, String>() : authTokens;
- mHasBeenAccepted = hasBeenAccepted == null
- ? new HashMap<String, Boolean>() : hasBeenAccepted;
+ mHasBeenAccepted =
+ hasBeenAccepted == null ? new HashMap<String, Boolean>() : hasBeenAccepted;
mAlwaysAccept = alwaysAccept;
mFeatures = features;
}
@@ -68,7 +67,8 @@ public class AccountHolder {
}
public boolean hasBeenAccepted(String authTokenType) {
- return mAlwaysAccept || mHasBeenAccepted.containsKey(authTokenType)
+ return mAlwaysAccept
+ || mHasBeenAccepted.containsKey(authTokenType)
&& mHasBeenAccepted.get(authTokenType);
}
@@ -170,15 +170,18 @@ public class AccountHolder {
}
private Builder copy() {
- return create().account(mAccount).password(mPassword).authTokens(mAuthTokens)
- .hasBeenAcceptedMap(mHasBeenAccepted).alwaysAccept(mAlwaysAccept);
+ return create()
+ .account(mAccount)
+ .password(mPassword)
+ .authTokens(mAuthTokens)
+ .hasBeenAcceptedMap(mHasBeenAccepted)
+ .alwaysAccept(mAlwaysAccept);
}
/**
* Used to construct AccountHolder instances.
*/
public static class Builder {
-
private Account mTempAccount;
private String mTempPassword;
@@ -259,5 +262,4 @@ public class AccountHolder {
mTempHasBeenAccepted, mTempAlwaysAccept, mFeatures);
}
}
-
}

Powered by Google App Engine
This is Rietveld 408576698