Moved BrowsingDataCounter and part of BrowsingDataCounterUtils to components.

chrome/browser/extensions/api/browsing_data/browsing_data_api.cc

 // 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.
 
 // Defines the Chrome Extensions BrowsingData API functions, which entail
 // clearing browsing data, and clearing the browser's cache (which, let's be
 // honest, are the same thing), as specified in the extension API JSON.
 
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 
@@ skipping 126 matching lines @@
       extension_browsing_data_api_constants::kUnprotectedWebKey,
       prefs->GetBoolean(prefs::kDeleteCookies));
   origin_types->SetBoolean(
       extension_browsing_data_api_constants::kProtectedWebKey,
       prefs->GetBoolean(prefs::kDeleteHostedAppsData));
   origin_types->SetBoolean(
       extension_browsing_data_api_constants::kExtensionsKey, false);
 
   // Fill deletion time period.
   int period_pref = prefs->GetInteger(prefs::kDeleteTimePeriod);
-  BrowsingDataRemover::TimePeriod period =
-      static_cast<BrowsingDataRemover::TimePeriod>(period_pref);
+  TimePeriod period = static_cast<TimePeriod>(period_pref);
   double since = 0;
-  if (period != BrowsingDataRemover::EVERYTHING) {
-    base::Time time = BrowsingDataRemover::CalculateBeginDeleteTime(period);
+  if (period != EVERYTHING) {
+    base::Time time = CalculateBeginDeleteTime(period);
     since = time.ToJsTime();
   }
 
   std::unique_ptr<base::DictionaryValue> options(new base::DictionaryValue);
   options->Set(extension_browsing_data_api_constants::kOriginTypesKey,
                origin_types.release());
   options->SetDouble(extension_browsing_data_api_constants::kSinceKey, since);
 
   // Fill dataToRemove and dataRemovalPermitted.
   std::unique_ptr<base::DictionaryValue> selected(new base::DictionaryValue);
@@ skipping 159 matching lines @@
   }
 
   // If we're good to go, add a ref (Balanced in OnBrowsingDataRemoverDone)
   AddRef();
 
   // Create a BrowsingDataRemover, set the current object as an observer (so
   // that we're notified after removal) and call remove() with the arguments
   // we've generated above. We can use a raw pointer here, as the browsing data
   // remover is responsible for deleting itself once data removal is complete.
   observer_.Add(remover);
-  remover->Remove(
-      BrowsingDataRemover::TimeRange(remove_since_, base::Time::Max()),
-      removal_mask_, origin_type_mask_);
+  remover->Remove(TimeRange(remove_since_, base::Time::Max()), removal_mask_,
+                  origin_type_mask_);
 }
 
 int BrowsingDataRemoverFunction::ParseOriginTypeMask(
     const base::DictionaryValue& options) {
   // Parse the |options| dictionary to generate the origin set mask. Default to
   // UNPROTECTED_WEB if the developer doesn't specify anything.
   int mask = BrowsingDataHelper::UNPROTECTED_WEB;
 
   const base::DictionaryValue* d = NULL;
   if (options.HasKey(extension_browsing_data_api_constants::kOriginTypesKey)) {
@@ skipping 107 matching lines @@
   return BrowsingDataRemover::REMOVE_SERVICE_WORKERS;
 }
 
 int BrowsingDataRemoveCacheStorageFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_CACHE_STORAGE;
 }
 
 int BrowsingDataRemoveWebSQLFunction::GetRemovalMask() {
   return BrowsingDataRemover::REMOVE_WEBSQL;
 }