Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

components/browsing_data/counters/browsing_data_counter.h

-// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.

[msramek, 2016/06/21 14:43:56]

I think you can keep the year, as the class was written then. But you can remove
the "(c)", since we no longer use that.

[ioanap, 2016/06/23 14:56:27]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COUNTER_H_
-#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COUNTER_H_
+#ifndef COMPONENTS_BROWSING_DATA_COUNTERS_BROWSING_DATA_COUNTER_H_
+#define COMPONENTS_BROWSING_DATA_COUNTERS_BROWSING_DATA_COUNTER_H_
 
 #include <stdint.h>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "chrome/browser/browsing_data/browsing_data_remover.h"
-#include "chrome/browser/profiles/profile.h"
 #include "components/prefs/pref_member.h"
+#include "components/prefs/pref_service.h"

[msramek, 2016/06/21 14:43:56]

Prefer forward declarations before includes in .h files. That means:

class PrefService;

here, and then

#include "pref_service.h"

in the .cc file.

[ioanap, 2016/06/23 14:56:27]

Done.

[msramek, 2016/06/21 14:43:56]

In //chrome/browser, we usually don't use namespaces, but in //components, we
always use the name of the component. Please wrap these declarations in:


namespace browsing_data {
}  // namespace browsing_data

[ioanap, 2016/06/23 14:56:27]

Done.

 class BrowsingDataCounter {
  public:
   typedef int64_t ResultInt;
 
   // Base class of results returned by BrowsingDataCounter. When the computation
   // has started, an instance is returned to represent a pending result.
   class Result {
    public:
     explicit Result(const BrowsingDataCounter* source);
     virtual ~Result();
@@ skipping 22 matching lines @@
     ResultInt Value() const;
 
    private:
     ResultInt value_;
 
     DISALLOW_COPY_AND_ASSIGN(FinishedResult);
   };
 
   typedef base::Callback<void(std::unique_ptr<Result>)> Callback;
 
-  BrowsingDataCounter();
+  BrowsingDataCounter(const std::string& pref_name);
   virtual ~BrowsingDataCounter();
 
   // Should be called once to initialize this class.
-  void Init(Profile* profile,
+  void Init(PrefService* pref_service,
+            const std::string& delete_time_period_pref,

[msramek, 2016/06/21 14:43:56]

This should ideally also be defined in the component, so we don't have to pass
it here, e.g. in //components/browsing_data/pref_names.[cc|h].

See e.g.
https://cs.chromium.org/chromium/src/components/content_settings/core/common/...

[ioanap, 2016/06/23 14:56:27]

Done.

             const Callback& callback);
 
   // Name of the preference associated with this counter.
-  virtual const std::string& GetPrefName() const = 0;
+  const std::string& GetPrefName() const;
 
-  // The profile associated with this counter.
-  Profile* GetProfile() const;
+  // PrefService that manages the preferences for the user profile
+  // associated with this counter.
+  PrefService* GetPrefs() const;
 
   // Restarts the counter. Will be called automatically if the counting needs
   // to be restarted, e.g. when the deletion preference changes state or when
   // we are notified of data changes.
   void Restart();
 
  protected:
   // Should be called from |Count| by any overriding class to indicate that
   // counting is finished and report |value| as the result.
   void ReportResult(ResultInt value);
 
   // A convenience overload of the previous method that allows subclasses to
   // provide a custom |result|.
   void ReportResult(std::unique_ptr<Result> result);
 
   // Calculates the beginning of the counting period as |period_| before now.
   base::Time GetPeriodStart();
 
  private:
   // Called after the class is initialized by calling |Init|.
   virtual void OnInitialized();
 
   // Count the data.
   virtual void Count() = 0;
 
-  // The profile for which we will count the data volume.
-  Profile* profile_;
+  // Name of the preference associated with this counter.
+  const std::string pref_name_;
+
+  // Pointer to the PrefService that manages the preferences for the user
+  // profile associated with this counter.
+  PrefService* pref_service_;
 
   // The callback that will be called when the UI should be updated with a new
   // counter value.
   Callback callback_;
 
   // The boolean preference indicating whether this data type is to be deleted.
   // If false, we will not count it.
   BooleanPrefMember pref_;
 
   // The integer preference describing the time period for which this data type
   // is to be deleted.
   IntegerPrefMember period_;
 
   // Whether this class was properly initialized by calling |Init|.
   bool initialized_ = false;
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COUNTER_H_
+#endif  // COMPONENTS_BROWSING_DATA_COUNTERS_BROWSING_DATA_COUNTER_H_