Revert of Disable search functionality in ChromeActivity before search promo check

chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
index feac855fab62e4b11a2dce121243fd3b0f5bdfe0..fed5e2d3f0399d902d92effd4ba81b6ab363750c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java
@@ -8,7 +8,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.StrictMode;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 
@@ -114,14 +113,8 @@
      * Default constructor.
      */
     public LocaleManager() {
-        int state = SEARCH_ENGINE_PROMO_SHOULD_CHECK;
-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
-        try {
-            ContextUtils.getAppSharedPreferences().getInt(
-                    KEY_SEARCH_ENGINE_PROMO_SHOW_STATE, SEARCH_ENGINE_PROMO_SHOULD_CHECK);
-        } finally {
-            StrictMode.setThreadPolicy(oldPolicy);
-        }
+        int state = ContextUtils.getAppSharedPreferences().getInt(
+                KEY_SEARCH_ENGINE_PROMO_SHOW_STATE, SEARCH_ENGINE_PROMO_SHOULD_CHECK);
         mSearchEnginePromoCompleted = state == SEARCH_ENGINE_PROMO_CHECKED_AND_SHOWN;
     }
 
@@ -456,14 +449,8 @@
      * @return Whether we still have to check for whether search engine dialog is necessary.
      */
     public boolean needToCheckForSearchEnginePromo() {
-        int state = SEARCH_ENGINE_PROMO_SHOULD_CHECK;
-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
-        try {
-            ContextUtils.getAppSharedPreferences().getInt(
-                    KEY_SEARCH_ENGINE_PROMO_SHOW_STATE, SEARCH_ENGINE_PROMO_SHOULD_CHECK);
-        } finally {
-            StrictMode.setThreadPolicy(oldPolicy);
-        }
+        int state = ContextUtils.getAppSharedPreferences().getInt(
+                KEY_SEARCH_ENGINE_PROMO_SHOW_STATE, SEARCH_ENGINE_PROMO_SHOULD_CHECK);
         return state == SEARCH_ENGINE_PROMO_SHOULD_CHECK;
     }