Added namespace browsing_data_counter_utils

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 4f2aaf37c5805e948d3ed35af3f5b8a2ff5a3518..4ea0d72ef56073c39118d612b4c1540fbfe5c362 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -73,7 +73,7 @@ void ClearBrowserDataHandler::InitializeHandler() {
       base::Bind(&ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged,
                  base::Unretained(this)));
 
-  if (AreCountersEnabled()) {
+  if (browsing_data_counter_utils::AreCountersEnabled()) {
     AddCounter(make_scoped_ptr(new PasswordsCounter()));
     AddCounter(make_scoped_ptr(new HistoryCounter()));
     AddCounter(make_scoped_ptr(new CacheCounter()));
@@ -89,7 +89,7 @@ void ClearBrowserDataHandler::InitializeHandler() {
 void ClearBrowserDataHandler::InitializePage() {
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.createFooter",
-      base::FundamentalValue(AreCountersEnabled()),
+      base::FundamentalValue(browsing_data_counter_utils::AreCountersEnabled()),
       base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()));
   UpdateInfoBannerVisibility();
   OnBrowsingHistoryPrefChanged();
@@ -126,7 +126,7 @@ void ClearBrowserDataHandler::UpdateInfoBannerVisibility() {
 
 void ClearBrowserDataHandler::OnPageOpened(const base::ListValue* value) {
   for (BrowsingDataCounter* counter : counters_) {
-    DCHECK(AreCountersEnabled());
+    DCHECK(browsing_data_counter_utils::AreCountersEnabled());
     counter->Restart();
   }
 }
@@ -138,9 +138,10 @@ void ClearBrowserDataHandler::GetLocalizedValues(
   static OptionsStringResource resources[] = {
     { "clearBrowserDataLabel", IDS_CLEAR_BROWSING_DATA_LABEL },
     { "clearBrowserDataSyncWarning", IDS_CLEAR_BROWSING_DATA_SYNCED_DELETION },
-    { "clearBrowserDataSupportString", AreCountersEnabled()
-        ? IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS_SIMPLE
-        : IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS },
+    { "clearBrowserDataSupportString",
+          browsing_data_counter_utils::AreCountersEnabled()
+              ? IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS_SIMPLE
+              : IDS_CLEAR_BROWSING_DATA_SOME_STUFF_REMAINS },
     { "deleteBrowsingHistoryCheckbox", IDS_DEL_BROWSING_HISTORY_CHKBOX },
     { "deleteDownloadHistoryCheckbox", IDS_DEL_DOWNLOAD_HISTORY_CHKBOX },
     { "deleteCacheCheckbox", IDS_DEL_CACHE_CHKBOX },
@@ -308,7 +309,7 @@ void ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged() {
 
 void ClearBrowserDataHandler::AddCounter(
     scoped_ptr<BrowsingDataCounter> counter) {
-  DCHECK(AreCountersEnabled());
+  DCHECK(browsing_data_counter_utils::AreCountersEnabled());
 
   counter->Init(
       Profile::FromWebUI(web_ui()),
@@ -319,11 +320,12 @@ void ClearBrowserDataHandler::AddCounter(
 
 void ClearBrowserDataHandler::UpdateCounterText(
     scoped_ptr<BrowsingDataCounter::Result> result) {
-  DCHECK(AreCountersEnabled());
+  DCHECK(browsing_data_counter_utils::AreCountersEnabled());
   web_ui()->CallJavascriptFunction(
       "ClearBrowserDataOverlay.updateCounter",
       base::StringValue(result->source()->GetPrefName()),
-      base::StringValue(GetCounterTextFromResult(result.get())));
+      base::StringValue(
+          browsing_data_counter_utils::GetCounterTextFromResult(result.get())));
 }
 
 void ClearBrowserDataHandler::OnStateChanged() {