Merge 62782 - Revert 62189 - [Mac] Update Clear Browsing dialog for proper functioning from incognito windows, only hide server data delete if switch is not set. Mirror to r62147.

nib changes:
- for the five "clear server data" items, hidden bound to !owner.isSyncVisible
- for the "clear server data" button, enabled bound to owner.isSyncEnabled, enabled2 bound to !isClearing

BUG=none
TEST=none

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

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

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

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@62950 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 43 insertions, 108 deletions

diff --git a/chrome/app/nibs/ClearBrowsingData.xib b/chrome/app/nibs/ClearBrowsingData.xib
index eb99359..1111d4b 100644
--- a/chrome/app/nibs/ClearBrowsingData.xib
+++ b/chrome/app/nibs/ClearBrowsingData.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="158"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1216,31 +1216,15 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: clearingStatus</string>
-						<reference key="source" ref="682642417"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="682642417"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: clearingStatus</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">clearingStatus</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">206</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="111752323"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="111752323"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1248,19 +1232,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">210</int>
+					<int key="connectionID">182</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="26218580"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="26218580"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1268,19 +1252,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">214</int>
+					<int key="connectionID">186</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="160073487"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="160073487"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1288,19 +1272,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">218</int>
+					<int key="connectionID">190</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="177347071"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="177347071"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1308,19 +1292,19 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">222</int>
+					<int key="connectionID">194</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: isSyncVisible</string>
+						<string key="label">hidden: isSyncEnabled</string>
 						<reference key="source" ref="461151812"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="461151812"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">hidden: isSyncVisible</string>
+							<string key="NSLabel">hidden: isSyncEnabled</string>
 							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">isSyncVisible</string>
+							<string key="NSKeyPath">isSyncEnabled</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">NSNegateBoolean</string>
@@ -1328,59 +1312,23 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">226</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isSyncEnabled</string>
-						<reference key="source" ref="909108966"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector" id="453378992">
-							<reference key="NSSource" ref="909108966"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: isSyncEnabled</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isSyncEnabled</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">229</int>
+					<int key="connectionID">198</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: isClearing</string>
-						<reference key="source" ref="909108966"/>
+						<string key="label">value: clearingStatus</string>
+						<reference key="source" ref="682642417"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="909108966"/>
+							<reference key="NSSource" ref="682642417"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled2: isClearing</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">isClearing</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="453378992"/>
+							<string key="NSLabel">value: clearingStatus</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">clearingStatus</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">232</int>
+					<int key="connectionID">206</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2126,7 +2074,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">232</int>
+			<int key="maxID">206</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.h b/chrome/browser/cocoa/clear_browsing_data_controller.h
index 6698cae..405a414 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.h
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.h
@@ -13,7 +13,6 @@
 class BrowsingDataRemover;
 class ClearBrowsingObserver;
 class Profile;
-class ProfileSyncService;
 @class ThrobberView;
 
 // Name of notification that is called when data is cleared.
@@ -33,7 +32,6 @@ extern NSString* const kClearBrowsingDataControllerRemoveMask;
   // automated tests. The remove deletes itself when it's done, so this is a
   // weak reference.
   BrowsingDataRemover* remover_;
-  ProfileSyncService* sync_service_;
   scoped_ptr<ClearBrowsingObserver> observer_;
   BOOL isClearing_;  // YES while clearing data is ongoing.
   NSString* clearingStatus_;
@@ -82,7 +80,6 @@ extern NSString* const kClearBrowsingDataControllerRemoveMask;
 @property (nonatomic) NSInteger timePeriod;
 @property (nonatomic) BOOL isClearing;
 @property (nonatomic, copy) NSString* clearingStatus;
-@property (readonly, nonatomic) BOOL isSyncVisible;
 @property (readonly, nonatomic) BOOL isSyncEnabled;
 
 @property (readonly) NSFont* labelFont;
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.mm b/chrome/browser/cocoa/clear_browsing_data_controller.mm
index 392d52e..ae2eb58 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.mm
@@ -121,19 +121,10 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer,
                         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;
@@ -146,8 +137,7 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer,
     // 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];
@@ -351,13 +341,13 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer,
   // 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];
     }
   }
@@ -367,8 +357,8 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer,
   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:
@@ -397,13 +387,13 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer,
   [self setIsClearing:deleteInProgress];
 }
 
-- (BOOL)isSyncVisible {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableClearServerData);
-}
-
 - (BOOL)isSyncEnabled {
-  return sync_service_ && sync_service_->HasSyncSetupCompleted();
+  BOOL allowClearServerDataUI =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableClearServerData);
+
+  return allowClearServerDataUI &&
+      profile_->GetProfileSyncService()->HasSyncSetupCompleted();
 }
 
 - (NSFont*)labelFont {