Move remaining clear browsing data util method to components

components/browsing_data/core/browsing_data_utils.cc

 // Copyright 2016 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.
 
 #include "components/browsing_data/core/browsing_data_utils.h"
 
 #include "components/browsing_data/core/counters/autofill_counter.h"
 #include "components/browsing_data/core/counters/history_counter.h"
 #include "components/browsing_data/core/counters/passwords_counter.h"
 #include "components/browsing_data/core/pref_names.h"
@@ skipping 123 matching lines @@
             displayed_strings[1], displayed_strings[2]);
         break;
       default:
         NOTREACHED();
     }
   }
 
   return text;
 }
 
+bool GetDeletionPreferenceFromDataType(
+    browsing_data::BrowsingDataType data_type,

[msramek, 2016/08/11 09:12:45]

Ditto here. Please remove the browsing_data qualification everywhere.

[ioanap, 2016/08/11 11:19:58]

Done.

+    std::string* out_pref) {
+  switch (data_type) {
+    case browsing_data::HISTORY:
+      *out_pref = browsing_data::prefs::kDeleteBrowsingHistory;
+      return true;
+    case browsing_data::CACHE:
+      *out_pref = browsing_data::prefs::kDeleteCache;
+      return true;
+    case browsing_data::COOKIES:
+      *out_pref = browsing_data::prefs::kDeleteCookies;
+      return true;
+    case browsing_data::PASSWORDS:
+      *out_pref = browsing_data::prefs::kDeletePasswords;
+      return true;
+    case browsing_data::FORM_DATA:
+      *out_pref = browsing_data::prefs::kDeleteFormData;
+      return true;
+    case browsing_data::BOOKMARKS:
+      // Bookmarks are deleted on the Android side. No corresponding deletion
+      // preference.
+      return false;
+    case browsing_data::NUM_TYPES:
+      // This is not an actual type.
+      NOTREACHED();
+      return false;
+  }
+  NOTREACHED();
+  return false;
+}
+
 }  // namespace browsing_data