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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java

Issue 1874423002: 🍰 Migrate app shared preferences to ContextUtils. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
index e796588c4988b3e5529e6e7562946339bb7dfe0b..425b03ffc64655b4d254dc422f83cbafd2eca5d8 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferencesManagerTest.java
@@ -6,12 +6,12 @@ package org.chromium.chrome.browser.preferences.privacy;
import android.content.Context;
import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
import android.test.InstrumentationTestCase;
import android.test.UiThreadTest;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R;
@@ -150,6 +150,7 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
boolean hasSetMetricsReporting, boolean isMetricsReportinEnabled,
boolean uploadPermitted) {
PermissionContext context = new PermissionContext(getInstrumentation().getTargetContext());
+ ContextUtils.initApplicationContextForTests(context.getApplicationContext());
PrivacyPreferencesManager preferenceManager =
new MockPrivacyPreferencesManager(context, mobileCapable, isConnected, wifiOn,
hasSetMetricsReporting, isMetricsReportinEnabled);
@@ -173,7 +174,7 @@ public class PrivacyPreferencesManagerTest extends InstrumentationTestCase {
}
private void setUpUserPreferences(Context context, UserUploadPreference userPreference) {
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+ SharedPreferences pref = ContextUtils.getAppSharedPreferences();
SharedPreferences.Editor ed = pref.edit()
.putString(PrivacyPreferencesManager.PREF_CRASH_DUMP_UPLOAD,
userPreference.toStringValue(context))

Powered by Google App Engine
This is Rietveld 408576698