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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java

Issue 546973003: [android] Proguard out most of guava (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged in from master (clean merge) Created 6 years, 3 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListItem.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 53ccdceb55169b4ad418df644d6b61048f51657c..d47f8e0547ccdbe4b665ac18dce91019180169f3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -7,8 +7,6 @@ package org.chromium.chrome.browser.sync;
import android.content.Context;
import android.util.Log;
-import com.google.common.base.Joiner;
-
import org.chromium.base.CalledByNative;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
@@ -17,6 +15,7 @@ import org.chromium.sync.internal_api.pub.SyncDecryptionPassphraseType;
import org.chromium.sync.internal_api.pub.base.ModelType;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -533,7 +532,16 @@ public class ProfileSyncService {
for (ModelType type : filteredTypes) {
set.add(type.toString());
}
- return Joiner.on(", ").join(set);
+ StringBuilder sb = new StringBuilder();
+ Iterator<String> it = set.iterator();
+ if (it.hasNext()) {
+ sb.append(it.next());
+ while (it.hasNext()) {
+ sb.append(", ");
+ sb.append(it.next());
+ }
+ }
+ return sb.toString();
}
// Native methods
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListItem.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698