Added unit tests for ClearBrowsingDataController....

chrome/browser/cocoa/clear_browsing_data_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 
 #include "base/mac_util.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/common/pref_names.h"
@@ skipping 60 matching lines @@
   scoped_nsobject<NSImage> throbberImage(
       [[NSImage alloc] initWithContentsOfFile:imagePath]);
   [progress_ setImage:throbberImage];
 }
 
 // Run application modal.
 - (void)runModalDialog {
   [[NSApplication sharedApplication] runModalForWindow:[self window]];
 }
 
-// Called when the user clicks the "clear" button. Do the work and persist
-// the prefs for next time. We don't stop the modal session until we get
-// the callback from the BrowsingDataRemover so the window stays on the screen.
-// While we're working, dim the buttons so the user can't click them.
-- (IBAction)clearData:(id)sender {
-  // Set that we're working so that the buttons disable.
-  [self setIsClearing:YES];
-
-  [self persistToPrefs];
-  
+- (int)removeMask {
   int removeMask = 0L;
   if (clearBrowsingHistory_)
     removeMask |= BrowsingDataRemover::REMOVE_HISTORY;
   if (clearDownloadHistory_)
     removeMask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (emptyCache_)
     removeMask |= BrowsingDataRemover::REMOVE_CACHE;
   if (deleteCookies_)
      removeMask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (clearSavedPasswords_)
      removeMask |= BrowsingDataRemover::REMOVE_PASSWORDS;
   if (clearFormData_)
-    removeMask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+    removeMask |= BrowsingDataRemover::REMOVE_FORM_DATA;
+  return removeMask;
+}
+
+// Called when the user clicks the "clear" button. Do the work and persist
+// the prefs for next time. We don't stop the modal session until we get
+// the callback from the BrowsingDataRemover so the window stays on the screen.
+// While we're working, dim the buttons so the user can't click them.
+- (IBAction)clearData:(id)sender {
+  // Set that we're working so that the buttons disable.
+  [self setIsClearing:YES];
+
+  [self persistToPrefs];
 
   // BrowsingDataRemover deletes itself when done.
   remover_ = new BrowsingDataRemover(profile_,
       static_cast<BrowsingDataRemover::TimePeriod>(timePeriod_),
       base::Time());
   remover_->AddObserver(observer_.get());
-  remover_->Remove(removeMask);
+  remover_->Remove([self removeMask]);
 }
 
 // Called when the user clicks the cancel button. All we need to do is stop
 // the modal session.
 - (IBAction)cancel:(id)sender {
   [[NSApplication sharedApplication] stopModal];
   [[self window] orderOut:self];
 }
 
 // Initialize the bools from prefs using the setters to be KVO-compliant.
@@ skipping 27 matching lines @@
 // Called when the data remover object is done with its work. Close the window.
 // The remover will delete itself. End the modal session at this point.
 - (void)dataRemoverDidFinish {
   [[NSApplication sharedApplication] stopModal];
   [[self window] orderOut:self];
   [self setIsClearing:NO];
   remover_ = NULL;
 }
 
 @end