Refactor BrowsingDataRemover creation for clarity.

chrome/browser/browsing_data/browsing_data_remover.cc

Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 58cbe5c231600ea3ceda5a9b290ca10ca6249791..8d2ce01fa5954d64df4734f33ac8883dde2350bf 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -100,52 +100,28 @@ BrowsingDataRemover::NotificationDetails::NotificationDetails(
 
 BrowsingDataRemover::NotificationDetails::~NotificationDetails() {}
 
-// TODO(mkwst): We should have one constructor, not two. http://crbug.com/130732
-BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
-                                         base::Time delete_begin,
-                                         base::Time delete_end)
-    : profile_(profile),
-      quota_manager_(NULL),
-      dom_storage_context_(NULL),
-      special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
-      delete_begin_(delete_begin),
-      delete_end_(delete_end),
-      next_cache_state_(STATE_NONE),
-      cache_(NULL),
-      main_context_getter_(profile->GetRequestContext()),
-      media_context_getter_(profile->GetMediaRequestContext()),
-      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),
-      waiting_for_clear_networking_history_(false),
-      waiting_for_clear_server_bound_certs_(false),
-      waiting_for_clear_plugin_data_(false),
-      waiting_for_clear_quota_managed_data_(false),
-      waiting_for_clear_content_licenses_(false),
-      waiting_for_clear_form_(false),
-      remove_mask_(0),
-      remove_origin_(GURL()),
-      origin_set_mask_(0) {
-  DCHECK(profile);
-  // crbug.com/140910: Many places were calling this with base::Time() as
-  // delete_end, even though they should've used base::Time::Now(). Work around
-  // it here. New code should use base::Time::Now().
-  DCHECK(delete_end_ != base::Time());
-  if (delete_end_ == base::Time())
-    delete_end_ = base::Time::Now();
+// static
+BrowsingDataRemover* BrowsingDataRemover::create(Profile* profile,
+    base::Time delete_begin, base::Time delete_end) {
+  return new BrowsingDataRemover(profile, delete_begin, delete_end);
+}
+
+// static
+BrowsingDataRemover* BrowsingDataRemover::create(Profile* profile,
+    TimePeriod time_period) {
+  return new BrowsingDataRemover(profile,
+      BrowsingDataRemover::CalculateBeginDeleteTime(time_period),
+      base::Time::Max());
 }
 
 BrowsingDataRemover::BrowsingDataRemover(Profile* profile,
-                                         TimePeriod time_period,
+                                         base::Time delete_begin,
                                          base::Time delete_end)
     : profile_(profile),
       quota_manager_(NULL),
       dom_storage_context_(NULL),
       special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
-      delete_begin_(CalculateBeginDeleteTime(time_period)),
+      delete_begin_(delete_begin),
       delete_end_(delete_end),
       next_cache_state_(STATE_NONE),
       cache_(NULL),