Ability to clear old history

chrome/browser/browsing_data_remover.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.
 
 #include "chrome/browser/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 111 matching lines @@
       waiting_for_clear_plugin_data_(false),
       waiting_for_clear_quota_managed_data_(false),
       waiting_for_clear_content_licenses_(false),
       remove_mask_(0),
       remove_origin_(GURL()),
       origin_set_mask_(0) {
   DCHECK(profile);
 }
 
 BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
-                                         TimePeriod time_period,
-                                         base::Time delete_end)
+                                         TimePeriod time_period)
     : profile_(profile),
       quota_manager_(NULL),
       dom_storage_context_(NULL),
       special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
       delete_begin_(CalculateBeginDeleteTime(time_period)),
-      delete_end_(delete_end),
+      delete_end_(CalculateEndDeleteTime(time_period)),
       next_cache_state_(STATE_NONE),
       cache_(NULL),
       main_context_getter_(profile->GetRequestContext()),
       media_context_getter_(profile->GetRequestContextForMedia()),
       deauthorize_content_licenses_request_id_(0),
       waiting_for_clear_cache_(false),
       waiting_for_clear_nacl_cache_(false),
       waiting_for_clear_cookies_count_(0),
       waiting_for_clear_history_(false),
       waiting_for_clear_local_storage_(false),
@@ skipping 328 matching lines @@
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::OverrideQuotaManagerForTesting(
     quota::QuotaManager* quota_manager) {
   quota_manager_ = quota_manager;
 }
 
 base::Time BrowsingDataRemover::CalculateBeginDeleteTime(
     TimePeriod time_period) {
-  base::TimeDelta diff;
-  base::Time delete_begin_time = base::Time::Now();
+  const base::Time now = base::Time::Now();
+  base::Time delete_begin_time;
   switch (time_period) {
     case LAST_HOUR:
-      diff = base::TimeDelta::FromHours(1);
+      delete_begin_time = now - base::TimeDelta::FromHours(1);
       break;
     case LAST_DAY:
-      diff = base::TimeDelta::FromHours(24);
+      delete_begin_time = now - base::TimeDelta::FromDays(1);
       break;
     case LAST_WEEK:
-      diff = base::TimeDelta::FromHours(7*24);
+      delete_begin_time = now - base::TimeDelta::FromDays(7);
       break;
     case FOUR_WEEKS:
-      diff = base::TimeDelta::FromHours(4*7*24);
+      delete_begin_time = now - base::TimeDelta::FromDays(7 * 4);
+      break;
+    case EXCEPT_LAST_HOUR:
+    case EXCEPT_LAST_DAY:
+    case EXCEPT_LAST_WEEK:
+    case EXCEPT_FOUR_WEEKS:
+      delete_begin_time = base::Time();
       break;
     case EVERYTHING:
       delete_begin_time = base::Time();
       break;
     default:
       NOTREACHED() << L"Missing item";
       break;
   }
-  return delete_begin_time - diff;
+  return delete_begin_time;
+}
+
+base::Time BrowsingDataRemover::CalculateEndDeleteTime(
+    TimePeriod time_period) {
+  const base::Time now = base::Time::Now();
+  base::Time delete_end_time;
+  switch (time_period) {
+    case LAST_HOUR:
+    case LAST_DAY:
+    case LAST_WEEK:
+    case FOUR_WEEKS:
+      delete_end_time = base::Time();
+      break;
+    case EXCEPT_LAST_HOUR:
+      delete_end_time = now - base::TimeDelta::FromHours(1);
+      break;
+    case EXCEPT_LAST_DAY:
+      delete_end_time = now - base::TimeDelta::FromDays(1);
+      break;
+    case EXCEPT_LAST_WEEK:
+      delete_end_time = now - base::TimeDelta::FromDays(7);
+      break;
+    case EXCEPT_FOUR_WEEKS:
+      delete_end_time = now - base::TimeDelta::FromDays(7 * 4);
+      break;
+    case EVERYTHING:
+      delete_end_time = base::Time();
+      break;
+    default:
+      NOTREACHED() << L"Missing item";
+      break;
+  }
+  return delete_end_time;
 }
 
 bool BrowsingDataRemover::AllDone() {
   return registrar_.IsEmpty() &&
       !waiting_for_clear_cache_ &&
       !waiting_for_clear_nacl_cache_ &&
       !waiting_for_clear_cookies_count_&&
       !waiting_for_clear_history_ &&
       !waiting_for_clear_local_storage_ &&
       !waiting_for_clear_networking_history_ &&
@@ skipping 355 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedServerBoundCerts,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedServerBoundCerts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_server_bound_certs_ = false;
   NotifyAndDeleteIfDone();
 }