Make the search engine prefs relayout based on their localized strings.

Move the instant experiment into a spot where it won't cause l10n issues.

BUG=64090
TEST=instant pref UI handles l10n correctly
Review URL: http://codereview.chromium.org/5359001

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

3 files changed, 154 insertions, 507 deletions

diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 9d5a9d9..769190d 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -12,11 +12,11 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="692"/>
-			<integer value="483"/>
 			<integer value="481"/>
 			<integer value="74"/>
+			<integer value="692"/>
 			<integer value="482"/>
+			<integer value="159"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -842,10 +842,26 @@
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSTextField" id="830051853">
+						<reference key="NSNextResponder" ref="930668015"/>
+						<int key="NSvFlags">265</int>
+						<string key="NSFrame">{{490, 84}, {33, 17}}</string>
+						<reference key="NSSuperview" ref="930668015"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="902643183">
+							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags2">71304192</int>
+							<string key="NSContents">[#]</string>
+							<reference key="NSSupport" ref="445696277"/>
+							<reference key="NSControlView" ref="830051853"/>
+							<reference key="NSBackgroundColor" ref="592613688"/>
+							<reference key="NSTextColor" ref="748094473"/>
+						</object>
+					</object>
 					<object class="NSButton" id="97616727">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{192, 80}, {96, 16}}</string>
+						<string key="NSFrame">{{192, 84}, {96, 16}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="195905329">
@@ -865,7 +881,7 @@
 					<object class="NSButton" id="846108626">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{190, 98}, {352, 18}}</string>
+						<string key="NSFrame">{{190, 101}, {332, 18}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="843802055">
@@ -1657,7 +1673,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<object class="NSTextField" id="881113898">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 153}, {168, 39}}</string>
+						<string key="NSFrame">{{17, 155}, {168, 39}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="519689237">
@@ -1673,7 +1689,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<object class="NSButton" id="136601899">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{190, 174}, {332, 18}}</string>
+						<string key="NSFrame">{{190, 176}, {332, 18}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="131780438">
@@ -1716,7 +1732,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<object class="NSTextField" id="254133467">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{17, 125}, {168, 19}}</string>
+						<string key="NSFrame">{{17, 84}, {168, 61}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="952238196">
@@ -1732,7 +1748,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<object class="NSPopUpButton" id="803459266">
 						<reference key="NSNextResponder" ref="930668015"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{189, 121}, {243, 26}}</string>
+						<string key="NSFrame">{{189, 122}, {243, 26}}</string>
 						<reference key="NSSuperview" ref="930668015"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="197973245">
@@ -4117,6 +4133,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">787</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">object4_</string>
+						<reference key="source" ref="609957344"/>
+						<reference key="destination" ref="846108626"/>
+					</object>
+					<int key="connectionID">788</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">object5_</string>
+						<reference key="source" ref="609957344"/>
+						<reference key="destination" ref="97616727"/>
+					</object>
+					<int key="connectionID">789</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">instantExperiment_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="830051853"/>
+					</object>
+					<int key="connectionID">792</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -4504,6 +4544,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="192681043"/>
 							<reference ref="846108626"/>
 							<reference ref="97616727"/>
+							<reference ref="830051853"/>
 						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Basics View</string>
@@ -5498,6 +5539,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="195905329"/>
 						<reference key="parent" ref="97616727"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">790</int>
+						<reference key="object" ref="830051853"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="902643183"/>
+						</object>
+						<reference key="parent" ref="930668015"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">791</int>
+						<reference key="object" ref="902643183"/>
+						<reference key="parent" ref="830051853"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5701,6 +5756,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>779.CustomClassName</string>
 					<string>78.IBPluginDependency</string>
 					<string>79.IBPluginDependency</string>
+					<string>790.IBPluginDependency</string>
+					<string>790.IBViewBoundsToFrameTransform</string>
+					<string>791.IBPluginDependency</string>
 					<string>80.IBPluginDependency</string>
 					<string>81.IBPluginDependency</string>
 					<string>82.IBPluginDependency</string>
@@ -5920,17 +5978,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>HyperlinkButtonCell</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDOQAAwuQAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABDPgAAwuQAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDQAAAwrQAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABCoAAAwqYAAA</bytes>
 					</object>
 					<string>HyperlinkButtonCell</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABD9QAAwuoAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5961,7 +6024,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">787</int>
+			<int key="maxID">792</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -6284,495 +6347,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>showPrivacyDashboard:</string>
 							<string>showSavedPasswords:</string>
 							<string>themesGallery:</string>
-							<string>toolbarButtonSelected:</string>
-							<string>useCurrentPagesAsHomepage:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addHomepage:</string>
-							<string>backgroundModeLearnMore:</string>
-							<string>browseDownloadLocation:</string>
-							<string>changeFontAndLanguageSettings:</string>
-							<string>clearData:</string>
-							<string>doSyncAction:</string>
-							<string>doSyncCustomize:</string>
-							<string>doSyncReauthentication:</string>
-							<string>importData:</string>
-							<string>learnMoreAboutInstant:</string>
-							<string>makeDefaultBrowser:</string>
-							<string>manageSearchEngines:</string>
-							<string>openProxyPreferences:</string>
-							<string>privacyLearnMore:</string>
-							<string>removeSelectedHomepages:</string>
-							<string>resetAutoOpenFiles:</string>
-							<string>resetThemeToDefault:</string>
-							<string>resetToDefaults:</string>
-							<string>showAutoFillSettings:</string>
-							<string>showCertificates:</string>
-							<string>showContentSettings:</string>
-							<string>showPreferences:</string>
-							<string>showPrivacyDashboard:</string>
-							<string>showSavedPasswords:</string>
-							<string>themesGallery:</string>
-							<string>toolbarButtonSelected:</string>
-							<string>useCurrentPagesAsHomepage:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">addHomepage:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">backgroundModeLearnMore:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">browseDownloadLocation:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">changeFontAndLanguageSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">clearData:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">doSyncAction:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">doSyncCustomize:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">doSyncReauthentication:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">importData:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">learnMoreAboutInstant:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">makeDefaultBrowser:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">manageSearchEngines:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openProxyPreferences:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">privacyLearnMore:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">removeSelectedHomepages:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">resetAutoOpenFiles:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">resetThemeToDefault:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">resetToDefaults:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showAutoFillSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showCertificates:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showContentSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPreferences:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPrivacyDashboard:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showSavedPasswords:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">themesGallery:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toolbarButtonSelected:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">useCurrentPagesAsHomepage:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>autoFillSettingsButton_</string>
-							<string>backgroundModeCheckbox_</string>
-							<string>backgroundModeDescription_</string>
-							<string>backgroundModeLearnMore_</string>
-							<string>backgroundModeTitle_</string>
-							<string>basicsGroupDefaultBrowser_</string>
-							<string>basicsGroupHomePage_</string>
-							<string>basicsGroupSearchEngine_</string>
-							<string>basicsGroupStartup_</string>
-							<string>basicsGroupToolbar_</string>
-							<string>basicsView_</string>
-							<string>clearDataButton_</string>
-							<string>contentSettingsButton_</string>
-							<string>customPagesArrayController_</string>
-							<string>downloadLocationButton_</string>
-							<string>downloadLocationControl_</string>
-							<string>enableLoggingCheckbox_</string>
-							<string>managedPrefsBannerView_</string>
-							<string>managedPrefsBannerWarningImage_</string>
-							<string>personalStuffGroupAutofill_</string>
-							<string>personalStuffGroupBrowserData_</string>
-							<string>personalStuffGroupPasswords_</string>
-							<string>personalStuffGroupSync_</string>
-							<string>personalStuffGroupThemes_</string>
-							<string>personalStuffView_</string>
-							<string>privacyDashboardLink_</string>
-							<string>resetFileHandlersButton_</string>
-							<string>syncButton_</string>
-							<string>syncCustomizeButton_</string>
-							<string>syncLink_</string>
-							<string>syncStatus_</string>
-							<string>toolbar_</string>
-							<string>underTheHoodContentView_</string>
-							<string>underTheHoodScroller_</string>
-							<string>underTheHoodView_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSView</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSArrayController</string>
-							<string>NSButton</string>
-							<string>NSPathControl</string>
-							<string>NSButton</string>
-							<string>VerticalGradientView</string>
-							<string>NSImageView</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSArray</string>
-							<string>NSView</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSToolbar</string>
-							<string>NSView</string>
-							<string>NSScrollView</string>
-							<string>NSView</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>autoFillSettingsButton_</string>
-							<string>backgroundModeCheckbox_</string>
-							<string>backgroundModeDescription_</string>
-							<string>backgroundModeLearnMore_</string>
-							<string>backgroundModeTitle_</string>
-							<string>basicsGroupDefaultBrowser_</string>
-							<string>basicsGroupHomePage_</string>
-							<string>basicsGroupSearchEngine_</string>
-							<string>basicsGroupStartup_</string>
-							<string>basicsGroupToolbar_</string>
-							<string>basicsView_</string>
-							<string>clearDataButton_</string>
-							<string>contentSettingsButton_</string>
-							<string>customPagesArrayController_</string>
-							<string>downloadLocationButton_</string>
-							<string>downloadLocationControl_</string>
-							<string>enableLoggingCheckbox_</string>
-							<string>managedPrefsBannerView_</string>
-							<string>managedPrefsBannerWarningImage_</string>
-							<string>personalStuffGroupAutofill_</string>
-							<string>personalStuffGroupBrowserData_</string>
-							<string>personalStuffGroupPasswords_</string>
-							<string>personalStuffGroupSync_</string>
-							<string>personalStuffGroupThemes_</string>
-							<string>personalStuffView_</string>
-							<string>privacyDashboardLink_</string>
-							<string>resetFileHandlersButton_</string>
-							<string>syncButton_</string>
-							<string>syncCustomizeButton_</string>
-							<string>syncLink_</string>
-							<string>syncStatus_</string>
-							<string>toolbar_</string>
-							<string>underTheHoodContentView_</string>
-							<string>underTheHoodScroller_</string>
-							<string>underTheHoodView_</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">autoFillSettingsButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">backgroundModeCheckbox_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">backgroundModeDescription_</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">backgroundModeLearnMore_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">backgroundModeTitle_</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsGroupDefaultBrowser_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsGroupHomePage_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsGroupSearchEngine_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsGroupStartup_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsGroupToolbar_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">basicsView_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">clearDataButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">contentSettingsButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">customPagesArrayController_</string>
-								<string key="candidateClassName">NSArrayController</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">downloadLocationButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">downloadLocationControl_</string>
-								<string key="candidateClassName">NSPathControl</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">enableLoggingCheckbox_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">managedPrefsBannerView_</string>
-								<string key="candidateClassName">VerticalGradientView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">managedPrefsBannerWarningImage_</string>
-								<string key="candidateClassName">NSImageView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffGroupAutofill_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffGroupBrowserData_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffGroupPasswords_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffGroupSync_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffGroupThemes_</string>
-								<string key="candidateClassName">NSArray</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">personalStuffView_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">privacyDashboardLink_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">resetFileHandlersButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">syncButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">syncCustomizeButton_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">syncLink_</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">syncStatus_</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbar_</string>
-								<string key="candidateClassName">NSToolbar</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">underTheHoodContentView_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">underTheHoodScroller_</string>
-								<string key="candidateClassName">NSScrollView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">underTheHoodView_</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/preferences_window_controller.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">VerticalGradientView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/vertical_gradient_view.h</string>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">PreferencesWindowController</string>
-					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addHomepage:</string>
-							<string>backgroundModeLearnMore:</string>
-							<string>browseDownloadLocation:</string>
-							<string>changeFontAndLanguageSettings:</string>
-							<string>clearData:</string>
-							<string>doSyncAction:</string>
-							<string>doSyncCustomize:</string>
-							<string>doSyncReauthentication:</string>
-							<string>importData:</string>
-							<string>learnMoreAboutInstant:</string>
-							<string>makeDefaultBrowser:</string>
-							<string>manageSearchEngines:</string>
-							<string>openProxyPreferences:</string>
-							<string>privacyLearnMore:</string>
-							<string>removeSelectedHomepages:</string>
-							<string>resetAutoOpenFiles:</string>
-							<string>resetThemeToDefault:</string>
-							<string>resetToDefaults:</string>
-							<string>showAutoFillSettings:</string>
-							<string>showCertificates:</string>
-							<string>showContentSettings:</string>
-							<string>showPreferences:</string>
-							<string>showPrivacyDashboard:</string>
-							<string>showSavedPasswords:</string>
-							<string>themesGallery:</string>
 							<string>toggleInstant:</string>
 							<string>toolbarButtonSelected:</string>
 							<string>useCurrentPagesAsHomepage:</string>
@@ -6980,6 +6554,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>downloadLocationControl_</string>
 							<string>enableLoggingCheckbox_</string>
 							<string>instantCheckbox_</string>
+							<string>instantExperiment_</string>
 							<string>managedPrefsBannerView_</string>
 							<string>managedPrefsBannerWarningImage_</string>
 							<string>personalStuffGroupAutofill_</string>
@@ -7019,6 +6594,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSPathControl</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
+							<string>NSTextField</string>
 							<string>VerticalGradientView</string>
 							<string>NSImageView</string>
 							<string>NSArray</string>
@@ -7061,6 +6637,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>downloadLocationControl_</string>
 							<string>enableLoggingCheckbox_</string>
 							<string>instantCheckbox_</string>
+							<string>instantExperiment_</string>
 							<string>managedPrefsBannerView_</string>
 							<string>managedPrefsBannerWarningImage_</string>
 							<string>personalStuffGroupAutofill_</string>
@@ -7155,6 +6732,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">instantExperiment_</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">managedPrefsBannerView_</string>
 								<string key="candidateClassName">VerticalGradientView</string>
 							</object>
@@ -7229,8 +6810,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBDocumentRelativeSource</string>
-						<string key="minorKey">../../browser/cocoa/preferences_window_controller.h</string>
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/preferences_window_controller.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">VerticalGradientView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">browser/cocoa/vertical_gradient_view.h</string>
 					</object>
 				</object>
 			</object>
diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h
index 1f5a295..51aa79b 100644
--- a/chrome/browser/cocoa/preferences_window_controller.h
+++ b/chrome/browser/cocoa/preferences_window_controller.h
@@ -91,6 +91,7 @@ class ProfileSyncService;
   BooleanPrefMember showHomeButton_;
   BooleanPrefMember instantEnabled_;
   IBOutlet NSButton* instantCheckbox_;
+  IBOutlet NSTextField* instantExperiment_;
   scoped_nsobject<SearchEngineListModel> searchEngineModel_;
   // Used when creating a new home page url to make the new cell editable.
   BOOL pendingSelectForEdit_;
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index cf06527..fb59ff1 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -108,7 +108,8 @@ enum AutoSizeGroupBehavior {
   kAutoSizeGroupBehaviorVerticalToFit,
   kAutoSizeGroupBehaviorVerticalFirstToFit,
   kAutoSizeGroupBehaviorHorizontalToFit,
-  kAutoSizeGroupBehaviorHorizontalFirstGrows
+  kAutoSizeGroupBehaviorHorizontalFirstGrows,
+  kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit
 };
 
 // Helper to tweak the layout of the "pref groups" and also ripple any height
@@ -195,6 +196,50 @@ CGFloat AutoSizeGroup(NSArray* views, AutoSizeGroupBehavior behavior,
       }
       break;
     }
+    case kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit: {
+      // Start out like kAutoSizeGroupBehaviorVerticalToFit but don't do
+      // the first two.  Then handle the two as a row, but apply any
+      // vertical shift.
+      // All but the first two (in the row); walk bottom up.
+      for (NSUInteger index = [views count] - 1; index > 2; --index) {
+        NSView* view = [views objectAtIndex:index];
+        NSSize delta = cocoa_l10n_util::WrapOrSizeToFit(view);
+        DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+        if (localVerticalShift) {
+          NSPoint origin = [view frame].origin;
+          origin.y += localVerticalShift;
+          [view setFrameOrigin:origin];
+        }
+        localVerticalShift += delta.height;
+      }
+      // Deal with the two for the horizontal row.  Size the second one.
+      CGFloat horizontalShift = 0.0;
+      NSView* view = [views objectAtIndex:2];
+      NSSize delta = cocoa_l10n_util::WrapOrSizeToFit(view);
+      DCHECK_GE(delta.height, 0.0) << "Should NOT shrink in height";
+      horizontalShift -= delta.width;
+      NSPoint origin = [view frame].origin;
+      origin.x += horizontalShift;
+      if (localVerticalShift) {
+        origin.y += localVerticalShift;
+      }
+      [view setFrameOrigin:origin];
+      // Now expand the first item in the row to consume the space opened up.
+      view = [views objectAtIndex:1];
+      if (horizontalShift) {
+        NSSize delta = NSMakeSize(horizontalShift, 0.0);
+        [GTMUILocalizerAndLayoutTweaker
+         resizeViewWithoutAutoResizingSubViews:view
+                                         delta:delta];
+      }
+      // And move it up by any amount needed from the previous items.
+      if (localVerticalShift) {
+        NSPoint origin = [view frame].origin;
+        origin.y += localVerticalShift;
+        [view setFrameOrigin:origin];
+      }
+      break;
+    }
     default:
       NOTREACHED();
       break;
@@ -639,8 +684,20 @@ class ManagedPrefsBannerState : public policy::ManagedPrefsBannerBase {
   verticalShift += AutoSizeGroup(basicsGroupDefaultBrowser_,
                                  kAutoSizeGroupBehaviorVerticalFirstToFit,
                                  verticalShift);
+  // TODO(rsesek/rohitrao): This is ugly, when the instant experiement is no
+  // longer displayed, please remove this code, the NSTextField and IBOutlet
+  // needed.
+  DCHECK(instantExperiment_ != nil);
+  if (verticalShift) {
+    // If the default browser moved things up, move the experiment field up
+    // also, it is not in the SearchEngine group due to its position on screen.
+    NSPoint origin = [instantExperiment_ frame].origin;
+    origin.y += verticalShift;
+    [instantExperiment_ setFrameOrigin:origin];
+  }
+  // End TODO
   verticalShift += AutoSizeGroup(basicsGroupSearchEngine_,
-                                 kAutoSizeGroupBehaviorHorizontalFirstGrows,
+                                 kAutoSizeGroupBehaviorFirstTwoAsRowVerticalToFit,
                                  verticalShift);
   verticalShift += AutoSizeGroup(basicsGroupToolbar_,
                                  kAutoSizeGroupBehaviorVerticalToFit,
@@ -1210,12 +1267,12 @@ enum { kHomepageNewTabPage, kHomepageURL };
   NSInteger state = enabled ? NSOnState : NSOffState;
   [instantCheckbox_ setState:state];
 
-  NSString* title = l10n_util::GetNSStringWithFixup(IDS_INSTANT_PREF);
+  NSString* title = @"";
   if (enabled) {
-    title = [NSString stringWithFormat:@"%@ [%d]", title,
+    title = [NSString stringWithFormat:@"[%d]",
         prefs_->GetInteger(prefs::kInstantType)];
   }
-  [instantCheckbox_ setTitle:title];
+  [instantExperiment_ setStringValue:title];
 }
 
 - (IBAction)learnMoreAboutInstant:(id)sender {