Move remaining clear browsing data util method to components

chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc

 // Copyright 2015 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/browsing_data/browsing_data_counter_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h"
-#include "chrome/browser/browsing_data/browsing_data_counter_utils.h"

[msramek, 2016/08/11 09:12:45]

As discussed offline: This #include will have to stay here because we need to
use GetChromeCounterTextFromResult (the Chrome version), not
browsing_data::GetCounterTextFromResult (the components version) in
onCounterFinished().

That is something that should be fixed in the base CL that we're depending on
(https://codereview.chromium.org/2228913003) though.

[ioanap, 2016/08/11 11:19:58]

Thank you for catching this!

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "jni/BrowsingDataCounterBridge_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 BrowsingDataCounterBridge::BrowsingDataCounterBridge(
     JNIEnv* env, const JavaParamRef<jobject>& obj, jint data_type)
     : jobject_(obj) {
   DCHECK_GE(data_type, 0);
   DCHECK_LT(data_type, browsing_data::NUM_TYPES);
 
   std::string pref;
-  if (!GetDeletionPreferenceFromDataType(
+  if (!browsing_data::GetDeletionPreferenceFromDataType(
           static_cast<browsing_data::BrowsingDataType>(data_type), &pref)) {
     return;
   }
 
   Profile* profile =
       ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
   counter_ = BrowsingDataCounterFactory::GetForProfileAndPref(profile, pref);
 
   if (!counter_)
     return;
@@ skipping 25 matching lines @@
           env, GetCounterTextFromResult(result.get()));
   Java_BrowsingDataCounterBridge_onBrowsingDataCounterFinished(
       env, jobject_.obj(), result_string.obj());
 }
 
 static jlong Init(
     JNIEnv* env, const JavaParamRef<jobject>& obj, int data_type) {
   return reinterpret_cast<intptr_t>(
       new BrowsingDataCounterBridge(env, obj, data_type));
 }