Refactor BrowsingDataRemover creation for clarity.

chrome/browser/browsing_data/browsing_data_remover_browsertest.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 "base/file_path.h"
 #include "base/path_service.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 37 matching lines @@
     std::string data;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
         script, &data));
     ASSERT_EQ(data, result);
   }
 
   void RemoveAndWait(int remove_mask) {
     content::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_BROWSING_DATA_REMOVED,
-        content::Source<Profile>(browser()->profile()));  
-    BrowsingDataRemover* remover = new BrowsingDataRemover(
-        browser()->profile(), BrowsingDataRemover::LAST_HOUR,
-        base::Time::Now() + base::TimeDelta::FromMilliseconds(10));
+        content::Source<Profile>(browser()->profile()));
+    BrowsingDataRemover* remover = BrowsingDataRemover::CreateForPeriod(
+        browser()->profile(), BrowsingDataRemover::LAST_HOUR);
     remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB);
     signal.Wait();
   }
 };
 
 // Test BrowsingDataRemover for downloads.
 IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, Download) {
   ScopedTempDir downloads_directory;
   ASSERT_TRUE(downloads_directory.CreateUniqueTempDir());
   browser()->profile()->GetPrefs()->SetFilePath(
@@ skipping 34 matching lines @@
   RunScriptAndCheckResult(L"insertRecord('text')", "done");
   RunScriptAndCheckResult(L"getRecords()", "text");
 
   RemoveAndWait(BrowsingDataRemover::REMOVE_SITE_DATA);
 
   ui_test_utils::NavigateToURL(browser(), url);
   RunScriptAndCheckResult(L"createTable()", "done");
   RunScriptAndCheckResult(L"insertRecord('text2')", "done");
   RunScriptAndCheckResult(L"getRecords()", "text2");
 }