| Index: chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| index 512b4547b65686107affc55fc08ee5d76285d70e..9afca1572eee57523edb55f652321f585cd52629 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
| @@ -168,8 +168,7 @@ public class FeatureUtilities {
|
| // Allowing disk access for preferences while prototyping.
|
| StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
|
| try {
|
| - sCachedHerbFlavor =
|
| - ChromePreferenceManager.getInstance(context).getCachedHerbFlavor();
|
| + sCachedHerbFlavor = ChromePreferenceManager.getInstance().getCachedHerbFlavor();
|
| } finally {
|
| StrictMode.setThreadPolicy(oldPolicy);
|
| }
|
| @@ -222,7 +221,7 @@ public class FeatureUtilities {
|
| sCachedHerbFlavor = newFlavor;
|
|
|
| if (!TextUtils.equals(oldFlavor, newFlavor)) {
|
| - ChromePreferenceManager.getInstance(context).setCachedHerbFlavor(newFlavor);
|
| + ChromePreferenceManager.getInstance().setCachedHerbFlavor(newFlavor);
|
| }
|
| }
|
|
|
| @@ -246,7 +245,7 @@ public class FeatureUtilities {
|
| if (DeviceFormFactor.isTablet(context)) return;
|
|
|
| boolean isChromeHomeEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME);
|
| - ChromePreferenceManager manager = ChromePreferenceManager.getInstance(context);
|
| + ChromePreferenceManager manager = ChromePreferenceManager.getInstance();
|
| boolean valueChanged = isChromeHomeEnabled != manager.isChromeHomeEnabled();
|
| manager.setChromeHomeEnabled(isChromeHomeEnabled);
|
| sChromeHomeEnabled = isChromeHomeEnabled;
|
| @@ -260,9 +259,7 @@ public class FeatureUtilities {
|
| */
|
| public static boolean isChromeHomeEnabled() {
|
| if (sChromeHomeEnabled == null) {
|
| - ChromePreferenceManager manager =
|
| - ChromePreferenceManager.getInstance(ContextUtils.getApplicationContext());
|
| - sChromeHomeEnabled = manager.isChromeHomeEnabled();
|
| + sChromeHomeEnabled = ChromePreferenceManager.getInstance().isChromeHomeEnabled();
|
| }
|
|
|
| return sChromeHomeEnabled;
|
|
|