Revert 61848 - [Mac] UI for clearing sync data on the server.

xib change: Nest current checkboxes inside tab, add needed elements to other tab.

BUG=57876
TEST=as in bug 54349; functionality currently hidden behind flag

Review URL: http://codereview.chromium.org/3590020

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/3840001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62786 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 24 deletions

diff --git a/chrome/browser/views/clear_server_data.cc b/chrome/browser/views/clear_server_data.cc
index ee4e1eb..d01daf6 100644
--- a/chrome/browser/views/clear_server_data.cc
+++ b/chrome/browser/views/clear_server_data.cc
@@ -286,13 +286,12 @@ void ClearServerDataView::OnStateChanged() {
 void ClearServerDataView::UpdateControlEnabledState() {
   bool delete_in_progress = false;
 
-  // Succeeded/FailedClearingServerData should only be called once, not every
-  // time the view is refreshed.  As such, on success/failure handle that state
-  // and immediately reset things back to CLEAR_NOT_STARTED.
+  // We only want to call Suceeded/FailedClearingServerData once, not every
+  // time the view is refreshed.  As such, on success/failure we handle that
+  // state and immediately reset things back to CLEAR_NOT_STARTED.
   ProfileSyncService::ClearServerDataState clear_state =
-      (sync_service_ == NULL) ?
-      ProfileSyncService::CLEAR_NOT_STARTED :
-      sync_service_->GetClearServerDataState();
+    profile_->GetProfileSyncService()->GetClearServerDataState();
+  profile_->GetProfileSyncService()->ResetClearServerDataState();
 
   if (NULL != sync_service_) {
     sync_service_->ResetClearServerDataState();
@@ -300,30 +299,30 @@ void ClearServerDataView::UpdateControlEnabledState() {
 
   switch (clear_state) {
     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.
+      // We can get here when we 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.
-      status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_SENDING));
-      status_label_->SetVisible(true);
-      delete_in_progress = true;
+        // Clearing buttons on all tabs are disabled at this
+        // point, throbber is going
+        status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_SENDING));
+        status_label_->SetVisible(true);
+        delete_in_progress = true;
       break;
     case ProfileSyncService::CLEAR_FAILED:
-      // Show an error and reallow clearing.
-      clear_data_parent_window_->FailedClearingServerData();
-      status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_ERROR));
-      status_label_->SetVisible(true);
-      delete_in_progress = false;
+        // Show an error and reallow clearing
+        clear_data_parent_window_->FailedClearingServerData();
+        status_label_->SetText(l10n_util::GetString(IDS_CLEAR_DATA_ERROR));
+        status_label_->SetVisible(true);
+        delete_in_progress = false;
       break;
     case ProfileSyncService::CLEAR_SUCCEEDED:
-      // Close the dialog box, success!
-      status_label_->SetVisible(false);
-      delete_in_progress = false;
-      clear_data_parent_window_->SucceededClearingServerData();
+        // Close the dialog box, success!
+        status_label_->SetVisible(false);
+        delete_in_progress = false;
+        clear_data_parent_window_->SucceededClearingServerData();
       break;
-  }
+    }
 
   // allow_clear can be false when a local browsing data clear is happening
   // from the neighboring tab.  delete_in_progress means that a clear is
diff --git a/chrome/browser/views/clear_server_data.h b/chrome/browser/views/clear_server_data.h
index 64254f3..647ab9a 100644
--- a/chrome/browser/views/clear_server_data.h
+++ b/chrome/browser/views/clear_server_data.h
@@ -91,7 +91,7 @@ class ClearServerDataView : public views::View,
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 
-  // ConfirmMessageBoxObserver methods.
+  // ProfileSyncServiceObserver
   virtual void OnConfirmMessageAccept();
   virtual void OnConfirmMessageCancel();