Merge 62782 - Revert 62189 - [Mac] Update Clear Browsing dialog for proper fu...

chrome/browser/cocoa/clear_browsing_data_controller.mm

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/scoped_nsobject.h"
@@ skipping 103 matching lines @@
 }
 
 - (id)initWithProfile:(Profile*)profile {
   DCHECK(profile);
   // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we
   // can override it in a unit test.
   NSString *nibpath = [mac_util::MainAppBundle()
                         pathForResource:@"ClearBrowsingData"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
+    profile_ = profile;
     observer_.reset(new ClearBrowsingObserver(self));
-
-    // Always show preferences for the original profile. Most state when off
-    // the record comes from the original profile, but we explicitly use
-    // the original profile to avoid potential problems.
-    profile_ = profile->GetOriginalProfile();
-    sync_service_ = profile_->GetProfileSyncService();
-
-    if (sync_service_) {
-      sync_service_->ResetClearServerDataState();
-      sync_service_->AddObserver(observer_.get());
-    }
-
+    profile_->GetProfileSyncService()->ResetClearServerDataState();
+    profile_->GetProfileSyncService()->AddObserver(observer_.get());
     [self initFromPrefs];
   }
   return self;
 }
 
 - (void)dealloc {
   if (remover_) {
     // We were destroyed while clearing history was in progress. This can only
     // occur during automated tests (normally the user can't close the dialog
     // while clearing is in progress as the dialog is modal and not closeable).
     remover_->RemoveObserver(observer_.get());
   }
-  if (sync_service_)
-    sync_service_->RemoveObserver(observer_.get());
+  profile_->GetProfileSyncService()->RemoveObserver(observer_.get());
   [self setClearingStatus:nil];
 
   [super dealloc];
 }
 
 // Run application modal.
 - (void)runModalDialog {
   // Check again to make sure there is only one window.  Since we use
   // |performSelector:afterDelay:| it is possible for this to somehow be
   // triggered twice.
@@ skipping 183 matching lines @@
   [self setClearingStatus:nil];
   [self setIsClearing:NO];
   remover_ = NULL;
 }
 
 - (IBAction)stopSyncAndDeleteData:(id)sender {
   // Protect against the unlikely case where the server received a message, and
   // the syncer syncs and resets itself before the user tries pressing the Clear
   // button in this dialog again. TODO(raz) Confirm whether we have an issue
   // here
-  if (sync_service_->HasSyncSetupCompleted()) {
+  if (profile_->GetProfileSyncService()->HasSyncSetupCompleted()) {
     bool clear = platform_util::SimpleYesNoBox(
         nil,
         l10n_util::GetStringUTF16(IDS_CONFIRM_CLEAR_TITLE),
         l10n_util::GetStringUTF16(IDS_CONFIRM_CLEAR_DESCRIPTION));
     if (clear) {
-      sync_service_->ClearServerData();
+      profile_->GetProfileSyncService()->ClearServerData();
       [self syncStateChanged];
     }
   }
 }
 
 - (void)syncStateChanged {
   bool deleteInProgress = false;
 
   ProfileSyncService::ClearServerDataState clearState =
-      sync_service_->GetClearServerDataState();
-  sync_service_->ResetClearServerDataState();
+      profile_->GetProfileSyncService()->GetClearServerDataState();
+  profile_->GetProfileSyncService()->ResetClearServerDataState();
 
   switch (clearState) {
     case ProfileSyncService::CLEAR_NOT_STARTED:
       // This can occur on a first start and after a failed clear (which does
       // not close the tab). Do nothing.
       break;
     case ProfileSyncService::CLEAR_CLEARING:
       // Clearing buttons on all tabs are disabled at this point, throbber is
       // going.
       [self setClearingStatus:l10n_util::GetNSString(IDS_CLEAR_DATA_SENDING)];
       deleteInProgress = true;
       break;
     case ProfileSyncService::CLEAR_FAILED:
       // Show an error and reallow clearing.
       [self setClearingStatus:l10n_util::GetNSString(IDS_CLEAR_DATA_ERROR)];
       deleteInProgress = false;
       break;
     case ProfileSyncService::CLEAR_SUCCEEDED:
       // Close the dialog box, success!
       [self setClearingStatus:nil];
       deleteInProgress = false;
       [self closeDialog];
       break;
   }
 
   [self setIsClearing:deleteInProgress];
 }
 
-- (BOOL)isSyncVisible {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableClearServerData);
-}
+- (BOOL)isSyncEnabled {
+  BOOL allowClearServerDataUI =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClearServerData);
 
-- (BOOL)isSyncEnabled {
-  return sync_service_ && sync_service_->HasSyncSetupCompleted();
+  return allowClearServerDataUI &&
+      profile_->GetProfileSyncService()->HasSyncSetupCompleted();
 }
 
 - (NSFont*)labelFont {
   return [NSFont boldSystemFontOfSize:13];
 }
 
 @end