Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

chrome/browser/browsing_data/browsing_data_remover.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 #define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <stdint.h>
 
 #include <set>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/common/features.h"
+#include "components/browsing_data/browsing_data_utils.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/prefs/pref_member.h"
 #include "components/search_engines/template_url_service.h"
 #include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_PLUGINS)
@@ skipping 29 matching lines @@
 #endif
 
 // BrowsingDataRemover is responsible for removing data related to browsing:
 // visits in url database, downloads, cookies ...
 class BrowsingDataRemover : public KeyedService
 #if defined(ENABLE_PLUGINS)
                             , public PepperFlashSettingsManager::Client
 #endif
 {
  public:
-  // Time period ranges available when doing browsing data removals.
-  // TODO(msramek): As this is now reused on Android, we should move it
-  // to browsing_data_counter_utils.h (and rename appropriately), so that
-  // all fundamental types related to browsing data on all platforms are in
-  // one place.
-  //
-  // A Java counterpart will be generated for this enum.
-  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
-  enum TimePeriod {
-    LAST_HOUR = 0,
-    LAST_DAY,
-    LAST_WEEK,
-    FOUR_WEEKS,
-    EVERYTHING,
-    TIME_PERIOD_LAST = EVERYTHING
-  };
-
   // Mask used for Remove.
   enum RemoveDataMask {
     REMOVE_APPCACHE = 1 << 0,
     REMOVE_CACHE = 1 << 1,
     REMOVE_COOKIES = 1 << 2,
     REMOVE_DOWNLOADS = 1 << 3,
     REMOVE_FILE_SYSTEMS = 1 << 4,
     REMOVE_FORM_DATA = 1 << 5,
     // In addition to visits, REMOVE_HISTORY removes keywords, last session and
     // passwords UI statistics.
@@ skipping 77 matching lines @@
     base::Time removal_begin;
 
     // The removal mask (see the RemoveDataMask enum for details).
     int removal_mask;
 
     // The origin type mask (see BrowsingDataHelper::OriginTypeMask for
     // details).
     int origin_type_mask;
   };
 
-  struct TimeRange {
-    TimeRange(base::Time begin, base::Time end) : begin(begin), end(end) {}
-
-    base::Time begin;
-    base::Time end;
-  };
-
   // Observer is notified when the removal is done. Done means keywords have
   // been deleted, cache cleared and all other tasks scheduled.
   class Observer {
    public:
     virtual void OnBrowsingDataRemoverDone() = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
@@ skipping 10 matching lines @@
     // and will be prevented from completing until after the callback
     // |continue_to_completion| is run.
     virtual void OnBrowsingDataRemoverWouldComplete(
         BrowsingDataRemover* remover,
         const base::Closure& continue_to_completion) = 0;
 
    protected:
     virtual ~CompletionInhibitor() {}
   };
 
-  static TimeRange Unbounded();
-
-  static TimeRange Period(TimePeriod period);
-
-  // Calculate the begin time for the deletion range specified by |time_period|.
-  static base::Time CalculateBeginDeleteTime(TimePeriod time_period);
-
   // Is the BrowsingDataRemover currently in the process of removing data?
   bool is_removing() { return is_removing_; }
 
   // Sets a CompletionInhibitor, which will be notified each time an instance is
   // about to complete a browsing data removal process, and will be able to
   // artificially delay the completion.
   // TODO(crbug.com/483528): Make this non-static.
   static void set_completion_inhibitor_for_testing(
       CompletionInhibitor* inhibitor) {
     completion_inhibitor_ = inhibitor;
@@ skipping 275 matching lines @@
   // not initialised, so the registry must be mocked out.
   std::unique_ptr<WebappRegistry> webapp_registry_;
 #endif
 
   base::WeakPtrFactory<BrowsingDataRemover> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_