Ability to clear old history

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

Index: chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
index da693e00739521698cc99b9e418895761421633e..6ae039302e83bda32ca0bd0ff51ec64cd1740ce0 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
@@ -45,6 +45,13 @@ void ClearBrowserDataHandler::InitializeHandler() {
                                       NULL);
 }
 
+ListValue* CreateClearOption(BrowsingDataRemover::TimePeriod period, int id) {
+    ListValue* option = new ListValue();
+    option->Append(Value::CreateIntegerValue(period));
+    option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(id)));
+    return option;
+}
+
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
@@ -74,30 +81,24 @@ void ClearBrowserDataHandler::GetLocalizedValues(
           kClearBrowsingDataLearnMoreUrl));
 
   ListValue* time_list = new ListValue;
-  for (int i = 0; i < 5; i++) {
-    string16 label_string;
-    switch (i) {
-      case 0:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_HOUR);
-        break;
-      case 1:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_DAY);
-        break;
-      case 2:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_WEEK);
-        break;
-      case 3:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_4WEEKS);
-        break;
-      case 4:
-        label_string = l10n_util::GetStringUTF16(IDS_CLEAR_DATA_EVERYTHING);
-        break;
-    }
-    ListValue* option = new ListValue();
-    option->Append(Value::CreateIntegerValue(i));
-    option->Append(Value::CreateStringValue(label_string));
-    time_list->Append(option);
-  }
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_HOUR, IDS_CLEAR_DATA_HOUR));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_DAY, IDS_CLEAR_DATA_DAY));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::LAST_WEEK, IDS_CLEAR_DATA_WEEK));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::FOUR_WEEKS, IDS_CLEAR_DATA_4WEEKS));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_HOUR, IDS_CLEAR_DATA_OLDER_THAN_1HOUR));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_DAY, IDS_CLEAR_DATA_OLDER_THAN_1DAY));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_LAST_WEEK, IDS_CLEAR_DATA_OLDER_THAN_1WEEK));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EXCEPT_FOUR_WEEKS, IDS_CLEAR_DATA_OLDER_THAN_4WEEKS));
+  time_list->Append(CreateClearOption(
+    BrowsingDataRemover::EVERYTHING, IDS_CLEAR_DATA_EVERYTHING));
   localized_strings->Set("clearBrowserDataTimeList", time_list);
 }
 
@@ -144,9 +145,8 @@ void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
 
   // BrowsingDataRemover deletes itself when done.
   int period_selected = prefs->GetInteger(prefs::kDeleteTimePeriod);
-  remover_ = new BrowsingDataRemover(profile,
-      static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
-      base::Time());
+  remover_ = new BrowsingDataRemover(
+      profile, static_cast<BrowsingDataRemover::TimePeriod>(period_selected));
   remover_->AddObserver(this);
   remover_->Remove(remove_mask, origin_mask);
 }