Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc

Index: chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
diff --git a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
index 0cbb30bd466478aa99037b44d24043dbfcc3e399..3af31e0dc04f4f1d4712fc155ad2252867e89e91 100644
--- a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
+++ b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
@@ -6,31 +6,34 @@
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
+#include "components/browsing_data/browsing_data_utils.h"
 #include "jni/BrowsingDataCounterBridge_jni.h"
 
 BrowsingDataCounterBridge::BrowsingDataCounterBridge(
     JNIEnv* env, const JavaParamRef<jobject>& obj, jint data_type)
     : jobject_(obj) {
   DCHECK_GE(data_type, 0);
-  DCHECK_LT(data_type, BrowsingDataType::NUM_TYPES);
+  DCHECK_LT(data_type, browsing_data::NUM_TYPES);
 
   std::string pref;
   if (!GetDeletionPreferenceFromDataType(
-      static_cast<BrowsingDataType>(data_type), &pref)) {
+          static_cast<browsing_data::BrowsingDataType>(data_type), &pref)) {
     return;
   }
 
-  counter_.reset(CreateCounterForPreference(pref));
+  Profile* profile =
+      ProfileManager::GetActiveUserProfile()->GetOriginalProfile();

[Bernhard Bauer, 2016/06/27 17:09:45]

I know you just moved this from existing code, but is the GetOriginalProfile()
necessary? Do we every try to clear browsing data for an incognito profile?

[msramek, 2016/06/28 14:06:19]

I'll respond, since this is my code :)

I would expect that it's not necessary, and that on Android
GetActiveUserProfile() will actually be the original profile. However, I
extracted this code from pref_service_bridge.cc which also diligently uses
GetOriginalProfile() wherever it needs a profile, so I wasn't sure about it.

I would prefer to play it safe and keep it, but if you're convinced it can never
be off the record, I'm fine with adding a DCHECK instead.

[Bernhard Bauer, 2016/06/28 14:29:38]

Yeah, I think the ProfileManager always only looks at non-incognito (cognito? 😃)
profiles, so I think we could do the DCHECK, but I don't feel strongly enough to
make someone shave this particular yak.

+  counter_.reset(CreateCounterForPreference(pref, profile));
 
   if (!counter_)
     return;
 
-  counter_->Init(
-      ProfileManager::GetActiveUserProfile()->GetOriginalProfile(),
-      base::Bind(&BrowsingDataCounterBridge::onCounterFinished,
-                 base::Unretained(this)));
+  counter_->Init(profile->GetPrefs(),
+                 base::Bind(&BrowsingDataCounterBridge::onCounterFinished,
+                            base::Unretained(this)));
   counter_->Restart();
 }
 
@@ -48,7 +51,7 @@ bool BrowsingDataCounterBridge::Register(JNIEnv* env) {
 }
 
 void BrowsingDataCounterBridge::onCounterFinished(
-    std::unique_ptr<BrowsingDataCounter::Result> result) {
+    std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> result_string =
       base::android::ConvertUTF16ToJavaString(