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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java

Issue 1967683002: Test Physical Web upgrade path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove dead store to local variable Created 4 years, 7 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: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
index 2e075ff0e1a928182e12b87fa425c5a307b35f3b..0273cd8cf457ef1646f1b308108275028bd6c872 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
@@ -300,21 +300,21 @@ class UrlManager {
}
private void initSharedPreferences() {
- SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
- int prefsVersion = prefs.getInt(PREFS_VERSION_KEY, 0);
-
// Check the version.
- if (prefsVersion != PREFS_VERSION) {
+ final SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
+ if (prefs.getInt(PREFS_VERSION_KEY, 0) != PREFS_VERSION) {
// Stored preferences are old, upgrade to the current version.
// TODO(cco3): This code may be deleted around m53.
- prefs.edit().putInt(PREFS_VERSION_KEY, PREFS_VERSION);
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... params) {
- mContext.getSharedPreferences(DEPRECATED_PREFS_NAME, Context.MODE_PRIVATE)
- .edit()
+ mContext.getSharedPreferences(
+ DEPRECATED_PREFS_NAME, Context.MODE_PRIVATE).edit()
.clear()
.apply();
+ prefs.edit()
+ .putInt(PREFS_VERSION_KEY, PREFS_VERSION)
+ .apply();
return null;
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -565,4 +565,14 @@ class UrlManager {
.remove(PREFS_NOTIFICATION_UPDATE_TIMESTAMP)
.apply();
}
+
+ @VisibleForTesting
+ static String getVersionKey() {
+ return PREFS_VERSION_KEY;
+ }
+
+ @VisibleForTesting
+ static int getVersion() {
+ return PREFS_VERSION;
+ }
}

Powered by Google App Engine
This is Rietveld 408576698