Pass the time parameter to PrefServiceBridge.clearBrowsingData() explicitly.

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 #include <stddef.h>
 #include <vector>
 
@@ skipping 534 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint time_period) {
   DCHECK_GE(time_period, 0);
   DCHECK_LE(time_period, BrowsingDataRemover::TIME_PERIOD_LAST);
   GetPrefService()->SetInteger(prefs::kDeleteTimePeriod, time_period);
 }
 
 static void ClearBrowsingData(JNIEnv* env,
                               const JavaParamRef<jobject>& obj,
-                              const JavaParamRef<jintArray>& data_types) {
+                              const JavaParamRef<jintArray>& data_types,
+                              jint time_period) {
   BrowsingDataRemover* browsing_data_remover =
       BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile());
   // ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
   // done.
   new ClearBrowsingDataObserver(env, obj, browsing_data_remover);
 
   std::vector<int> data_types_vector;
   base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector);
 
   int remove_mask = 0;
@@ skipping 17 matching lines @@
         break;
       case BOOKMARKS:
         // Bookmarks are deleted separately on the Java side.
         NOTREACHED();
         break;
       case NUM_TYPES:
         NOTREACHED();
     }
   }
 
-  int period_selected = GetPrefService()->GetInteger(prefs::kDeleteTimePeriod);
   browsing_data_remover->Remove(
       BrowsingDataRemover::Period(
-          static_cast<BrowsingDataRemover::TimePeriod>(period_selected)),
+          static_cast<BrowsingDataRemover::TimePeriod>(time_period)),
       remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
 }
 
 static jboolean CanDeleteBrowsingHistory(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
 }
 
 static void SetAllowCookiesEnabled(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
@@ skipping 429 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }