Commit 498caa6b authored by Henrique Nakashima's avatar Henrique Nakashima Committed by Commit Bot

Remove Int methods and removeKey() from ChromePreferenceManager.

Use SharedPreferencesManager instead.

Bug: 1017800
Change-Id: I3f0dafadf32f618f7baa05e5fb6f1114473658e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894399Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarDonn Denman <donnd@chromium.org>
Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712643}
parent 29435937
......@@ -9,7 +9,7 @@ import static org.chromium.chrome.browser.preferences.ChromePreferenceManager.TW
import org.chromium.base.StrictModeContext;
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import javax.inject.Inject;
......@@ -19,13 +19,12 @@ import dagger.Lazy;
* Record the results of showing a clear data dialog on TWA client uninstall or data clear.
*/
public class ClearDataDialogResultRecorder {
private final Lazy<ChromePreferenceManager> mPrefsManager;
private final Lazy<SharedPreferencesManager> mPrefsManager;
private final ChromeBrowserInitializer mBrowserInitializer;
private final TrustedWebActivityUmaRecorder mUmaRecorder;
@Inject
public ClearDataDialogResultRecorder(
Lazy<ChromePreferenceManager> manager,
public ClearDataDialogResultRecorder(Lazy<SharedPreferencesManager> manager,
ChromeBrowserInitializer browserInitializer,
TrustedWebActivityUmaRecorder umaRecorder) {
mPrefsManager = manager;
......
......@@ -22,6 +22,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial.C
import org.chromium.chrome.browser.contextualsearch.ContextualSearchSelectionController.SelectionType;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.util.UrlConstants;
import java.net.URL;
......@@ -43,7 +44,7 @@ class ContextualSearchPolicy {
private static final HashSet<String> PREDOMINENTLY_ENGLISH_SPEAKING_COUNTRIES =
CollectionUtil.newHashSet("GB", "US");
private final ChromePreferenceManager mPreferenceManager;
private final SharedPreferencesManager mPreferencesManager;
private final ContextualSearchSelectionController mSelectionController;
private ContextualSearchNetworkCommunicator mNetworkCommunicator;
private ContextualSearchPanel mSearchPanel;
......@@ -58,7 +59,7 @@ class ContextualSearchPolicy {
*/
public ContextualSearchPolicy(ContextualSearchSelectionController selectionController,
ContextualSearchNetworkCommunicator networkCommunicator) {
mPreferenceManager = ChromePreferenceManager.getInstance();
mPreferencesManager = SharedPreferencesManager.getInstance();
mSelectionController = selectionController;
mNetworkCommunicator = networkCommunicator;
......@@ -104,7 +105,7 @@ class ContextualSearchPolicy {
* @return the {@link DisableablePromoTapCounter}.
*/
DisableablePromoTapCounter getPromoTapCounter() {
return DisableablePromoTapCounter.getInstance(mPreferenceManager);
return DisableablePromoTapCounter.getInstance(mPreferencesManager);
}
/**
......@@ -195,14 +196,14 @@ class ContextualSearchPolicy {
// Bump the counter only when it is still enabled.
if (promoTapCounter.isEnabled()) promoTapCounter.increment();
}
int tapsSinceOpen = mPreferenceManager.incrementInt(
int tapsSinceOpen = mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
if (isUserUndecided()) {
ContextualSearchUma.logTapsSinceOpenForUndecided(tapsSinceOpen);
} else {
ContextualSearchUma.logTapsSinceOpenForDecided(tapsSinceOpen);
}
mPreferenceManager.incrementInt(
mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT);
}
......@@ -211,9 +212,9 @@ class ContextualSearchPolicy {
*/
void updateCountersForOpen() {
// Always completely reset the tap counters that accumulate only since the last open.
mPreferenceManager.writeInt(
mPreferencesManager.writeInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT, 0);
mPreferenceManager.writeInt(
mPreferencesManager.writeInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT, 0);
// Disable the "promo tap" counter, but only if we're using the Opt-out onboarding.
......@@ -222,11 +223,11 @@ class ContextualSearchPolicy {
getPromoTapCounter().disable();
// Bump the total-promo-opens counter.
int count = mPreferenceManager.incrementInt(
int count = mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
ContextualSearchUma.logPromoOpenCount(count);
}
mPreferenceManager.incrementInt(
mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT);
}
......@@ -238,9 +239,9 @@ class ContextualSearchPolicy {
*/
void updateCountersForQuickAnswer(boolean wasActivatedByTap, boolean doesAnswer) {
if (wasActivatedByTap && doesAnswer) {
mPreferenceManager.incrementInt(
mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT);
mPreferenceManager.incrementInt(
mPreferencesManager.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT);
}
}
......@@ -341,10 +342,12 @@ class ContextualSearchPolicy {
int selectionType = mSelectionController.getSelectionType();
if (selectionType == SelectionType.TAP) {
long currentTimeMillis = System.currentTimeMillis();
long lastAnimatedTimeMillis =
mPreferenceManager.getContextualSearchLastAnimationTime();
long lastAnimatedTimeMillis = mPreferencesManager.readLong(
ChromePreferenceManager.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME);
if (Math.abs(currentTimeMillis - lastAnimatedTimeMillis) > DateUtils.DAY_IN_MILLIS) {
mPreferenceManager.setContextualSearchLastAnimationTime(currentTimeMillis);
mPreferencesManager.writeLong(
ChromePreferenceManager.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME,
currentTimeMillis);
return true;
} else {
return false;
......@@ -388,7 +391,7 @@ class ContextualSearchPolicy {
*/
@VisibleForTesting
int getPromoOpenCount() {
return mPreferenceManager.readInt(
return mPreferencesManager.readInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
}
......@@ -397,7 +400,7 @@ class ContextualSearchPolicy {
*/
@VisibleForTesting
int getTapCount() {
return mPreferenceManager.readInt(
return mPreferencesManager.readInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
}
......
......@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.contextualsearch;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
/**
* Provides a ContextualSearchHeuristic for CTR Recording, logging, and eventually suppression.
......@@ -23,14 +24,14 @@ public class CtrSuppression extends ContextualSearchHeuristic {
private static Integer sCurrentWeekNumberCache;
private final ChromePreferenceManager mPreferenceManager;
private final SharedPreferencesManager mPreferenceManager;
/**
* Constructs an object that tracks impressions and clicks per user to produce CTR and
* impression metrics.
*/
CtrSuppression() {
mPreferenceManager = ChromePreferenceManager.getInstance();
mPreferenceManager = SharedPreferencesManager.getInstance();
// This needs to be done last in this constructor because the native code may call
// into this object.
......@@ -148,10 +149,14 @@ public class CtrSuppression extends ContextualSearchHeuristic {
* or we have never checked.
*/
private boolean didWeekChange(int currentWeekNumber) {
if (mPreferenceManager.getContextualSearchCurrentWeekNumber() == currentWeekNumber) {
if (mPreferenceManager.readInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER)
== currentWeekNumber) {
return false;
} else {
mPreferenceManager.setContextualSearchCurrentWeekNumber(currentWeekNumber);
mPreferenceManager.writeInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER,
currentWeekNumber);
return true;
}
}
......
......@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.contextualsearch;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
/**
* Manages the Contextual Search disable-able promo tap counter.
......@@ -29,7 +30,7 @@ class DisableablePromoTapCounter {
private static DisableablePromoTapCounter sInstance;
private final ChromePreferenceManager mPrefsManager;
private final SharedPreferencesManager mPrefsManager;
private int mCounter;
/**
......@@ -37,8 +38,7 @@ class DisableablePromoTapCounter {
* @param prefsManager The ChromePreferenceManager to get prefs from.
* @return the counter.
*/
static DisableablePromoTapCounter getInstance(
ChromePreferenceManager prefsManager) {
static DisableablePromoTapCounter getInstance(SharedPreferencesManager prefsManager) {
if (sInstance == null) {
sInstance = new DisableablePromoTapCounter(prefsManager);
}
......@@ -49,9 +49,10 @@ class DisableablePromoTapCounter {
* Private constructor -- use {@link #getInstance} to get the singleton instance.
* @param prefsManager The preferences manager to use.
*/
private DisableablePromoTapCounter(ChromePreferenceManager prefsManager) {
private DisableablePromoTapCounter(SharedPreferencesManager prefsManager) {
mPrefsManager = prefsManager;
setRawCounter(prefsManager.getContextualSearchTapTriggeredPromoCount());
setRawCounter(prefsManager.readInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT));
}
/**
......@@ -106,7 +107,8 @@ class DisableablePromoTapCounter {
* Writes the current counter's raw value to persistent storage.
*/
private void writeRawCounter() {
mPrefsManager.setContextualSearchTapTriggeredPromoCount(mCounter);
mPrefsManager.writeInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT, mCounter);
}
/**
......
......@@ -6,12 +6,13 @@ package org.chromium.chrome.browser.contextualsearch;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial.ContextualSearchSwitch;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
/**
* Provides a ContextualSearchHeuristic for Engagement with the feature.
*/
public class EngagementSuppression extends ContextualSearchHeuristic {
private final ChromePreferenceManager mPreferenceManager;
private final SharedPreferencesManager mPreferenceManager;
private final boolean mIsConditionSatisfied;
private final boolean mIsEnabled;
......@@ -19,7 +20,7 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
* Constructs an object that tracks panel opens and other measures of engagement.
*/
EngagementSuppression() {
mPreferenceManager = ChromePreferenceManager.getInstance();
mPreferenceManager = SharedPreferencesManager.getInstance();
mIsEnabled = ContextualSearchFieldTrial.getSwitch(
ContextualSearchSwitch.IS_ENGAGEMENT_SUPPRESSION_ENABLED);
// Used for manual testing; suppress when we've had an entity impression but no open,
......@@ -56,7 +57,7 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
*/
public static void registerQuickActionImpression(
boolean wasPanelOpened, boolean wasActionClicked) {
ChromePreferenceManager prefs = ChromePreferenceManager.getInstance();
SharedPreferencesManager prefs = SharedPreferencesManager.getInstance();
prefs.incrementInt(
ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT);
if (wasActionClicked) {
......@@ -73,7 +74,7 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
* @param wasPanelOpened Whether the panel was opened.
*/
public static void registerContextualCardsImpression(boolean wasPanelOpened) {
ChromePreferenceManager prefs = ChromePreferenceManager.getInstance();
SharedPreferencesManager prefs = SharedPreferencesManager.getInstance();
prefs.incrementInt(ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT);
if (wasPanelOpened) {
prefs.incrementInt(ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT);
......
......@@ -18,7 +18,7 @@ import androidx.annotation.StyleRes;
import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
import org.chromium.chrome.browser.flags.FeatureUtilities;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.themes.ThemePreferences;
/**
......@@ -136,7 +136,7 @@ public class NightModeUtils {
* @return The current theme setting. See {@link ThemePreferences.ThemeSetting}.
*/
public static @ThemePreferences.ThemeSetting int getThemeSetting() {
int userSetting = ChromePreferenceManager.getInstance().readInt(UI_THEME_SETTING_KEY, -1);
int userSetting = SharedPreferencesManager.getInstance().readInt(UI_THEME_SETTING_KEY, -1);
if (userSetting == -1) {
return FeatureUtilities.isNightModeDefaultToLight()
? ThemePreferences.ThemeSetting.LIGHT
......
......@@ -116,11 +116,12 @@ public class ChromePreferenceManager {
@Deprecated
private static final String PREF_WEBSITE_SETTINGS_FILTER = "website_settings_filter";
private static final String CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT =
public static final String CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT =
"contextual_search_tap_triggered_promo_count";
private static final String CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME =
public static final String CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME =
"contextual_search_last_animation_time";
private static final String CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER =
public static final String CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER =
"contextual_search_current_week_number";
/**
......@@ -391,54 +392,6 @@ public class ChromePreferenceManager {
mManager.writeStringSet(SIGNIN_PROMO_LAST_SHOWN_ACCOUNT_NAMES, accountNames);
}
/**
* @return The last time the search provider icon was animated on tap.
*/
public long getContextualSearchLastAnimationTime() {
return mManager.readLong(CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME);
}
/**
* Sets the last time the search provider icon was animated on tap.
* @param time The last time the search provider icon was animated on tap.
*/
public void setContextualSearchLastAnimationTime(long time) {
mManager.writeLong(CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME, time);
}
/**
* @return Number of times the promo was triggered to peek by a tap gesture, or a negative value
* if in the disabled state.
*/
public int getContextualSearchTapTriggeredPromoCount() {
return mManager.readInt(CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT);
}
/**
* Sets the number of times the promo was triggered to peek by a tap gesture.
* Use a negative value to record that the counter has been disabled.
* @param count Number of times the promo was triggered by a tap gesture, or a negative value
* to record that the counter has been disabled.
*/
public void setContextualSearchTapTriggeredPromoCount(int count) {
mManager.writeInt(CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT, count);
}
/**
* @return The current week number, persisted for weekly CTR recording.
*/
public int getContextualSearchCurrentWeekNumber() {
return mManager.readInt(CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER);
}
/**
* Sets the current week number to persist. Used for weekly CTR recording.
* @param weekNumber The week number to store.
*/
public void setContextualSearchCurrentWeekNumber(int weekNumber) {
mManager.writeInt(CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER, weekNumber);
}
/**
* Returns timestamp of the suppression period start if signin promos in the New Tab Page are
* temporarily suppressed; zero otherwise.
......@@ -513,52 +466,6 @@ public class ChromePreferenceManager {
return getTrustedWebActivityDisclosureAcceptedPackages().contains(packageName);
}
/**
* Writes the given int value to the named shared preference.
* @param key The name of the preference to modify.
* @param value The new value for the preference.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public void writeInt(String key, int value) {
mManager.writeInt(key, value);
}
/**
* Reads the given int value from the named shared preference, defaulting to 0 if not found.
* @param key The name of the preference to return.
* @return The value of the preference.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public int readInt(String key) {
return mManager.readInt(key);
}
/**
* Reads the given int value from the named shared preference.
* @param key The name of the preference to return.
* @param defaultValue The default value to return if the preference is not set.
* @return The value of the preference.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public int readInt(String key, int defaultValue) {
return mManager.readInt(key, defaultValue);
}
/**
* Increments the integer value specified by the given key. If no initial value is present then
* an initial value of 0 is assumed and incremented, so a new value of 1 is set.
* @param key The key specifying which integer value to increment.
* @return The newly incremented value.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public int incrementInt(String key) {
return mManager.incrementInt(key);
}
/**
* Writes the given boolean to the named shared preference.
*
......@@ -583,15 +490,4 @@ public class ChromePreferenceManager {
public boolean readBoolean(String key, boolean defaultValue) {
return mManager.readBoolean(key, defaultValue);
}
/**
* Removes the shared preference entry.
*
* @param key The key of the preference to remove.
* @deprecated Use {@link SharedPreferencesManager} instead.
*/
@Deprecated
public void removeKey(String key) {
mManager.removeKey(key);
}
}
......@@ -17,8 +17,8 @@ import androidx.annotation.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.night_mode.NightModeUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.PreferenceUtils;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.ui.UiUtils;
import java.lang.annotation.Retention;
......@@ -50,20 +50,20 @@ public class ThemePreferences extends PreferenceFragmentCompat {
PreferenceUtils.addPreferencesFromResource(this, R.xml.theme_preferences);
getActivity().setTitle(R.string.prefs_themes);
ChromePreferenceManager chromePreferenceManager = ChromePreferenceManager.getInstance();
SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getInstance();
RadioButtonGroupThemePreference radioButtonGroupThemePreference =
(RadioButtonGroupThemePreference) findPreference(PREF_UI_THEME_PREF);
radioButtonGroupThemePreference.initialize(NightModeUtils.getThemeSetting(),
chromePreferenceManager.readBoolean(DARKEN_WEBSITES_ENABLED_KEY, false));
sharedPreferencesManager.readBoolean(DARKEN_WEBSITES_ENABLED_KEY, false));
radioButtonGroupThemePreference.setOnPreferenceChangeListener((preference, newValue) -> {
if (ChromeFeatureList.isEnabled(
ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING)) {
chromePreferenceManager.writeBoolean(DARKEN_WEBSITES_ENABLED_KEY,
sharedPreferencesManager.writeBoolean(DARKEN_WEBSITES_ENABLED_KEY,
radioButtonGroupThemePreference.isDarkenWebsitesEnabled());
}
int theme = (int) newValue;
chromePreferenceManager.writeInt(UI_THEME_SETTING_KEY, theme);
sharedPreferencesManager.writeInt(UI_THEME_SETTING_KEY, theme);
return true;
});
}
......
......@@ -10,6 +10,7 @@ import org.chromium.base.test.params.ParameterProvider;
import org.chromium.base.test.params.ParameterSet;
import org.chromium.chrome.browser.flags.FeatureUtilities;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.themes.ThemePreferences;
import org.chromium.chrome.test.ui.DummyUiActivity;
......@@ -64,7 +65,8 @@ public class NightModeTestUtils {
* @param nightModeEnabled Whether night mode should be enabled.
*/
public static void setUpNightModeForChromeActivity(boolean nightModeEnabled) {
ChromePreferenceManager.getInstance().writeInt(ChromePreferenceManager.UI_THEME_SETTING_KEY,
SharedPreferencesManager.getInstance().writeInt(
ChromePreferenceManager.UI_THEME_SETTING_KEY,
nightModeEnabled ? ThemePreferences.ThemeSetting.DARK
: ThemePreferences.ThemeSetting.LIGHT);
}
......@@ -77,7 +79,7 @@ public class NightModeTestUtils {
FeatureUtilities.setNightModeAvailableForTesting(null);
NightModeUtils.setNightModeSupportedForTesting(null);
GlobalNightModeStateProviderHolder.resetInstanceForTesting();
ChromePreferenceManager.getInstance().removeKey(
SharedPreferencesManager.getInstance().removeKey(
ChromePreferenceManager.UI_THEME_SETTING_KEY);
}
}
......@@ -22,9 +22,9 @@ import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.FeatureUtilities;
import org.chromium.chrome.browser.night_mode.NightModeUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.Preferences;
import org.chromium.chrome.browser.preferences.PreferencesTest;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.themes.ThemePreferences.ThemeSetting;
import org.chromium.chrome.browser.ui.widget.RadioButtonWithDescription;
import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
......@@ -61,7 +61,7 @@ public class ThemePreferencesTest extends DummyUiActivityTestCase {
@Override
public void setUpTest() throws Exception {
super.setUpTest();
ChromePreferenceManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
SharedPreferencesManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
Preferences preferences = PreferencesTest.startPreferences(
InstrumentationRegistry.getInstrumentation(), ThemePreferences.class.getName());
mFragment = (ThemePreferences) preferences.getMainFragment();
......@@ -71,7 +71,7 @@ public class ThemePreferencesTest extends DummyUiActivityTestCase {
@Override
public void tearDownTest() throws Exception {
ChromePreferenceManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
SharedPreferencesManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
FeatureUtilities.setNightModeDefaultToLightForTesting(null);
super.tearDownTest();
}
......@@ -101,7 +101,7 @@ public class ThemePreferencesTest extends DummyUiActivityTestCase {
assertButtonCheckedCorrectly("System default", 0);
Assert.assertEquals(ThemeSetting.SYSTEM_DEFAULT, mPreference.getSetting());
Assert.assertEquals(mPreference.getSetting(),
ChromePreferenceManager.getInstance().readInt(UI_THEME_SETTING_KEY));
SharedPreferencesManager.getInstance().readInt(UI_THEME_SETTING_KEY));
// Select Light
Assert.assertEquals(R.id.light, getButton(1).getId());
......@@ -109,7 +109,7 @@ public class ThemePreferencesTest extends DummyUiActivityTestCase {
assertButtonCheckedCorrectly("Light", 1);
Assert.assertEquals(ThemeSetting.LIGHT, mPreference.getSetting());
Assert.assertEquals(mPreference.getSetting(),
ChromePreferenceManager.getInstance().readInt(UI_THEME_SETTING_KEY));
SharedPreferencesManager.getInstance().readInt(UI_THEME_SETTING_KEY));
// Select Dark
Assert.assertEquals(R.id.dark, getButton(2).getId());
......@@ -117,7 +117,7 @@ public class ThemePreferencesTest extends DummyUiActivityTestCase {
assertButtonCheckedCorrectly("Dark", 2);
Assert.assertEquals(ThemeSetting.DARK, mPreference.getSetting());
Assert.assertEquals(mPreference.getSetting(),
ChromePreferenceManager.getInstance().readInt(UI_THEME_SETTING_KEY));
SharedPreferencesManager.getInstance().readInt(UI_THEME_SETTING_KEY));
});
}
......
......@@ -26,7 +26,7 @@ import org.robolectric.annotation.Config;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
/**
* Tests for {@link ClearDataDialogResultRecorder}.
......@@ -34,7 +34,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
@RunWith(BaseRobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class ClearDataDialogResultRecorderTest {
private final ChromePreferenceManager mPrefsManager = ChromePreferenceManager.getInstance();
private final SharedPreferencesManager mPrefsManager = SharedPreferencesManager.getInstance();
@Mock ChromeBrowserInitializer mBrowserInitializer;
@Mock TrustedWebActivityUmaRecorder mUmaRecorder;
@Captor ArgumentCaptor<Runnable> mTaskOnNativeInitCaptor;
......
......@@ -31,7 +31,6 @@ import org.robolectric.annotation.Config;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.base.test.util.DisableIf;
import org.chromium.chrome.browser.flags.FeatureUtilities;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.themes.ThemePreferences;
......@@ -91,7 +90,7 @@ public class GlobalNightModeStateControllerTest {
@After
public void tearDown() {
ChromePreferenceManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
SharedPreferencesManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
}
@Test
......@@ -143,12 +142,12 @@ public class GlobalNightModeStateControllerTest {
@Test
public void testUpdateNightMode_Preference() {
// Set preference to dark theme and verify night mode is enabled.
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.DARK);
assertTrue(mGlobalNightModeStateController.isInNightMode());
// Set preference to light theme and verify night mode is disabled.
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.LIGHT);
assertFalse(mGlobalNightModeStateController.isInNightMode());
......@@ -172,7 +171,7 @@ public class GlobalNightModeStateControllerTest {
setSystemNightMode(true);
assertFalse(mGlobalNightModeStateController.isInNightMode());
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.DARK);
assertFalse(mGlobalNightModeStateController.isInNightMode());
......@@ -183,7 +182,7 @@ public class GlobalNightModeStateControllerTest {
mGlobalNightModeStateController.onApplicationStateChange(HAS_RUNNING_ACTIVITIES);
assertTrue(mGlobalNightModeStateController.isInNightMode());
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.SYSTEM_DEFAULT);
assertTrue(mGlobalNightModeStateController.isInNightMode());
......@@ -199,7 +198,7 @@ public class GlobalNightModeStateControllerTest {
mGlobalNightModeStateController.addObserver(mObserver);
// Verify that observer is called on night mode state changed from false to true.
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.DARK);
assertTrue(mGlobalNightModeStateController.isInNightMode());
verify(mObserver, times(1)).onNightModeStateChanged();
......@@ -215,14 +214,14 @@ public class GlobalNightModeStateControllerTest {
verify(mObserver, times(1)).onNightModeStateChanged();
// Verify that observer is called when set to light theme.
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.LIGHT);
assertFalse(mGlobalNightModeStateController.isInNightMode());
verify(mObserver, times(2)).onNightModeStateChanged();
// Verify that observer is not called after it is removed.
mGlobalNightModeStateController.removeObserver(mObserver);
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.DARK);
assertTrue(mGlobalNightModeStateController.isInNightMode());
verify(mObserver, times(2)).onNightModeStateChanged();
......
......@@ -16,7 +16,7 @@ import org.robolectric.annotation.Config;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.flags.FeatureUtilities;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.preferences.themes.ThemePreferences;
/**
......@@ -29,7 +29,7 @@ public class GlobalNightModeStateProviderHolderTest {
public void tearDown() {
FeatureUtilities.setNightModeAvailableForTesting(null);
GlobalNightModeStateProviderHolder.resetInstanceForTesting();
ChromePreferenceManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
SharedPreferencesManager.getInstance().removeKey(UI_THEME_SETTING_KEY);
}
@Test
......@@ -40,7 +40,7 @@ public class GlobalNightModeStateProviderHolderTest {
assertFalse(GlobalNightModeStateProviderHolder.getInstance().isInNightMode());
// Verify that night mode cannot be enabled.
ChromePreferenceManager.getInstance().writeInt(
SharedPreferencesManager.getInstance().writeInt(
UI_THEME_SETTING_KEY, ThemePreferences.ThemeSetting.DARK);
assertFalse(GlobalNightModeStateProviderHolder.getInstance().isInNightMode());
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment