AutoFill Mac UI telephone/fax fields now one.

Changes telephone and fax number entries in the Mac AutoFill dialog to be a single
text field for all three (1) country code, (2) area code, (3) number.

Renames address model fields city, state, country to be addressCity, addressState,
addressCountry.  This was due to subtle name clash with 'state' as a selector.

Nib changes: (1) changes bindings to reflect the renaming of city, state, and country
in the model.  (2)  collapse telephone and fax numbers from three fields each to a single field.

BUG=41233
TEST=AutoFillAddressModelTest, AutoFillCreditCardModelTest, AutoFillAddressViewControllerTest, AutoFillCreditCardViewControllerTest

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

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

8 files changed, 317 insertions, 415 deletions

diff --git a/chrome/app/nibs/AutoFillAddressFormView.xib b/chrome/app/nibs/AutoFillAddressFormView.xib
index 2329eeb..434e467 100644
--- a/chrome/app/nibs/AutoFillAddressFormView.xib
+++ b/chrome/app/nibs/AutoFillAddressFormView.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">9L31a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+		<string key="IBDocument.InterfaceBuilderVersion">680</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
@@ -450,7 +450,7 @@
 											<object class="NSTextField" id="848642703">
 												<reference key="NSNextResponder" ref="195575826"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{108, 54}, {117, 22}}</string>
+												<string key="NSFrame">{{18, 54}, {207, 22}}</string>
 												<reference key="NSSuperview" ref="195575826"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="111342920">
@@ -481,57 +481,6 @@
 													<reference key="NSTextColor" ref="21034430"/>
 												</object>
 											</object>
-											<object class="NSTextField" id="557852134">
-												<reference key="NSNextResponder" ref="195575826"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{18, 54}, {34, 22}}</string>
-												<reference key="NSSuperview" ref="195575826"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="31526252">
-													<int key="NSCellFlags">-1804468671</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="872268129"/>
-													<reference key="NSControlView" ref="557852134"/>
-													<bool key="NSDrawsBackground">YES</bool>
-													<reference key="NSBackgroundColor" ref="803370302"/>
-													<reference key="NSTextColor" ref="21034430"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="23131512">
-												<reference key="NSNextResponder" ref="195575826"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{60, 54}, {40, 22}}</string>
-												<reference key="NSSuperview" ref="195575826"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="463062819">
-													<int key="NSCellFlags">-1804468671</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="872268129"/>
-													<reference key="NSControlView" ref="23131512"/>
-													<bool key="NSDrawsBackground">YES</bool>
-													<reference key="NSBackgroundColor" ref="803370302"/>
-													<reference key="NSTextColor" ref="21034430"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="873535292">
-												<reference key="NSNextResponder" ref="195575826"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{260, 54}, {34, 22}}</string>
-												<reference key="NSSuperview" ref="195575826"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="486193331">
-													<int key="NSCellFlags">-1804468671</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="872268129"/>
-													<reference key="NSControlView" ref="873535292"/>
-													<bool key="NSDrawsBackground">YES</bool>
-													<reference key="NSBackgroundColor" ref="803370302"/>
-													<reference key="NSTextColor" ref="21034430"/>
-												</object>
-											</object>
 											<object class="NSTextField" id="714038373">
 												<reference key="NSNextResponder" ref="195575826"/>
 												<int key="NSvFlags">268</int>
@@ -597,23 +546,6 @@
 													<reference key="NSTextColor" ref="836547888"/>
 												</object>
 											</object>
-											<object class="NSTextField" id="538615142">
-												<reference key="NSNextResponder" ref="195575826"/>
-												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{302, 54}, {40, 22}}</string>
-												<reference key="NSSuperview" ref="195575826"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="294409474">
-													<int key="NSCellFlags">-1804468671</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents"/>
-													<reference key="NSSupport" ref="872268129"/>
-													<reference key="NSControlView" ref="538615142"/>
-													<bool key="NSDrawsBackground">YES</bool>
-													<reference key="NSBackgroundColor" ref="803370302"/>
-													<reference key="NSTextColor" ref="21034430"/>
-												</object>
-											</object>
 											<object class="NSTextField" id="537064214">
 												<reference key="NSNextResponder" ref="195575826"/>
 												<int key="NSvFlags">268</int>
@@ -666,7 +598,7 @@
 											<object class="NSTextField" id="115971484">
 												<reference key="NSNextResponder" ref="195575826"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{350, 54}, {117, 22}}</string>
+												<string key="NSFrame">{{260, 54}, {207, 22}}</string>
 												<reference key="NSSuperview" ref="195575826"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="285986798">
@@ -874,22 +806,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.country</string>
-						<reference key="source" ref="874857332"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="874857332"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.country</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.country</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">179</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: addressModel.addressLine2</string>
 						<reference key="source" ref="899454944"/>
 						<reference key="destination" ref="1001"/>
@@ -922,38 +838,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.city</string>
-						<reference key="source" ref="357318770"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="357318770"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.city</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.city</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">185</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.zip</string>
-						<reference key="source" ref="181252802"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="181252802"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.zip</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.zip</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">187</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: addressModel.lastName</string>
 						<reference key="source" ref="1016152685"/>
 						<reference key="destination" ref="1001"/>
@@ -986,22 +870,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.phoneNumber</string>
-						<reference key="source" ref="848642703"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="848642703"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.phoneNumber</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.phoneNumber</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: addressModel.middleName</string>
 						<reference key="source" ref="289669180"/>
 						<reference key="destination" ref="1001"/>
@@ -1018,179 +886,179 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.phoneCountryCode</string>
-						<reference key="source" ref="557852134"/>
+						<string key="label">value: addressModel.firstName</string>
+						<reference key="source" ref="731633316"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="557852134"/>
+							<reference key="NSSource" ref="731633316"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.phoneCountryCode</string>
+							<string key="NSLabel">value: addressModel.firstName</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.phoneCountryCode</string>
+							<string key="NSKeyPath">addressModel.firstName</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">197</int>
+					<int key="connectionID">208</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.phoneAreaCode</string>
-						<reference key="source" ref="23131512"/>
+						<string key="label">value: disclosureState.disclosed</string>
+						<reference key="source" ref="347358645"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="23131512"/>
+							<reference key="NSSource" ref="347358645"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.phoneAreaCode</string>
+							<string key="NSLabel">value: disclosureState.disclosed</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.phoneAreaCode</string>
+							<string key="NSKeyPath">disclosureState.disclosed</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">199</int>
+					<int key="connectionID">212</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">detailedView_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="556992356"/>
+					</object>
+					<int key="connectionID">214</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteAddress:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="164512976"/>
+					</object>
+					<int key="connectionID">217</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.faxCountryCode</string>
-						<reference key="source" ref="873535292"/>
+						<string key="label">enabled: canAlterDefault</string>
+						<reference key="source" ref="484404016"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="873535292"/>
+							<reference key="NSSource" ref="484404016"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.faxCountryCode</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.faxCountryCode</string>
+							<string key="NSLabel">enabled: canAlterDefault</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">canAlterDefault</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">201</int>
+					<int key="connectionID">221</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.state</string>
-						<reference key="source" ref="714038373"/>
+						<string key="label">value: isDefault</string>
+						<reference key="source" ref="484404016"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="714038373"/>
+							<reference key="NSSource" ref="484404016"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.state</string>
+							<string key="NSLabel">value: isDefault</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.state</string>
+							<string key="NSKeyPath">isDefault</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">204</int>
+					<int key="connectionID">223</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.faxAreaCode</string>
-						<reference key="source" ref="538615142"/>
+						<string key="label">value: addressModel.addressCity</string>
+						<reference key="source" ref="357318770"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="538615142"/>
+							<reference key="NSSource" ref="357318770"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.faxAreaCode</string>
+							<string key="NSLabel">value: addressModel.addressCity</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.faxAreaCode</string>
+							<string key="NSKeyPath">addressModel.addressCity</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">206</int>
+					<int key="connectionID">224</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.firstName</string>
-						<reference key="source" ref="731633316"/>
+						<string key="label">value: addressModel.addressState</string>
+						<reference key="source" ref="714038373"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="731633316"/>
+							<reference key="NSSource" ref="714038373"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.firstName</string>
+							<string key="NSLabel">value: addressModel.addressState</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.firstName</string>
+							<string key="NSKeyPath">addressModel.addressState</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">208</int>
+					<int key="connectionID">225</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: addressModel.faxNumber</string>
-						<reference key="source" ref="115971484"/>
+						<string key="label">value: addressModel.addressZip</string>
+						<reference key="source" ref="181252802"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="115971484"/>
+							<reference key="NSSource" ref="181252802"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: addressModel.faxNumber</string>
+							<string key="NSLabel">value: addressModel.addressZip</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">addressModel.faxNumber</string>
+							<string key="NSKeyPath">addressModel.addressZip</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">210</int>
+					<int key="connectionID">226</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: disclosureState.disclosed</string>
-						<reference key="source" ref="347358645"/>
+						<string key="label">value: addressModel.addressCountry</string>
+						<reference key="source" ref="874857332"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="347358645"/>
+							<reference key="NSSource" ref="874857332"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: disclosureState.disclosed</string>
+							<string key="NSLabel">value: addressModel.addressCountry</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">disclosureState.disclosed</string>
+							<string key="NSKeyPath">addressModel.addressCountry</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">212</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">detailedView_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="556992356"/>
-					</object>
-					<int key="connectionID">214</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">deleteAddress:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="164512976"/>
-					</object>
-					<int key="connectionID">217</int>
+					<int key="connectionID">227</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: canAlterDefault</string>
-						<reference key="source" ref="484404016"/>
+						<string key="label">value: addressModel.phoneWholeNumber</string>
+						<reference key="source" ref="848642703"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="484404016"/>
+							<reference key="NSSource" ref="848642703"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: canAlterDefault</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">canAlterDefault</string>
+							<string key="NSLabel">value: addressModel.phoneWholeNumber</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">addressModel.phoneWholeNumber</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">221</int>
+					<int key="connectionID">228</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: isDefault</string>
-						<reference key="source" ref="484404016"/>
+						<string key="label">value: addressModel.faxWholeNumber</string>
+						<reference key="source" ref="115971484"/>
 						<reference key="destination" ref="1001"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="484404016"/>
+							<reference key="NSSource" ref="115971484"/>
 							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: isDefault</string>
+							<string key="NSLabel">value: addressModel.faxWholeNumber</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">isDefault</string>
+							<string key="NSKeyPath">addressModel.faxWholeNumber</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">223</int>
+					<int key="connectionID">229</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1301,14 +1169,10 @@
 							<reference ref="433159674"/>
 							<reference ref="848642703"/>
 							<reference ref="289669180"/>
-							<reference ref="557852134"/>
-							<reference ref="23131512"/>
-							<reference ref="873535292"/>
 							<reference ref="714038373"/>
 							<reference ref="181356333"/>
 							<reference ref="316039049"/>
 							<reference ref="942868838"/>
-							<reference ref="538615142"/>
 							<reference ref="537064214"/>
 							<reference ref="731633316"/>
 							<reference ref="467266453"/>
@@ -1599,48 +1463,6 @@
 						<reference key="parent" ref="289669180"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="557852134"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="31526252"/>
-						</object>
-						<reference key="parent" ref="556992356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">80</int>
-						<reference key="object" ref="31526252"/>
-						<reference key="parent" ref="557852134"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">84</int>
-						<reference key="object" ref="23131512"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="463062819"/>
-						</object>
-						<reference key="parent" ref="556992356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="463062819"/>
-						<reference key="parent" ref="23131512"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">89</int>
-						<reference key="object" ref="873535292"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="486193331"/>
-						</object>
-						<reference key="parent" ref="556992356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">96</int>
-						<reference key="object" ref="486193331"/>
-						<reference key="parent" ref="873535292"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">65</int>
 						<reference key="object" ref="714038373"/>
 						<object class="NSMutableArray" key="children">
@@ -1697,20 +1519,6 @@
 						<reference key="parent" ref="942868838"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">91</int>
-						<reference key="object" ref="538615142"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="294409474"/>
-						</object>
-						<reference key="parent" ref="556992356"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">94</int>
-						<reference key="object" ref="294409474"/>
-						<reference key="parent" ref="538615142"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">64</int>
 						<reference key="object" ref="537064214"/>
 						<object class="NSMutableArray" key="children">
@@ -1881,28 +1689,16 @@
 					<string>76.IBPluginDependency</string>
 					<string>77.IBPluginDependency</string>
 					<string>78.IBPluginDependency</string>
-					<string>79.CustomClassName</string>
-					<string>79.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
-					<string>80.IBPluginDependency</string>
 					<string>81.IBPluginDependency</string>
-					<string>84.CustomClassName</string>
-					<string>84.IBPluginDependency</string>
-					<string>85.IBPluginDependency</string>
 					<string>86.CustomClassName</string>
 					<string>86.IBPluginDependency</string>
 					<string>87.IBPluginDependency</string>
 					<string>88.IBPluginDependency</string>
-					<string>89.CustomClassName</string>
-					<string>89.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
-					<string>91.CustomClassName</string>
-					<string>91.IBPluginDependency</string>
 					<string>92.CustomClassName</string>
 					<string>92.IBPluginDependency</string>
 					<string>93.IBPluginDependency</string>
-					<string>94.IBPluginDependency</string>
-					<string>96.IBPluginDependency</string>
 					<string>97.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
@@ -1985,28 +1781,16 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>AutoFillTextField</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>
 					<string>AutoFillTextField</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>AutoFillTextField</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>AutoFillTextField</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>AutoFillTextField</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>AutoFillTextField</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>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
@@ -2030,7 +1814,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">223</int>
+			<int key="maxID">229</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/chrome/browser/autofill/autofill_address_model_mac.h b/chrome/browser/autofill/autofill_address_model_mac.h
index 92d02ae..9ea052f 100644
--- a/chrome/browser/autofill/autofill_address_model_mac.h
+++ b/chrome/browser/autofill/autofill_address_model_mac.h
@@ -29,16 +29,12 @@ class AutoFillProfile;
   NSString* companyName_;
   NSString* addressLine1_;
   NSString* addressLine2_;
-  NSString* city_;
-  NSString* state_;
-  NSString* zip_;
-  NSString* country_;
-  NSString* phoneCountryCode_;
-  NSString* phoneAreaCode_;
-  NSString* phoneNumber_;
-  NSString* faxCountryCode_;
-  NSString* faxAreaCode_;
-  NSString* faxNumber_;
+  NSString* addressCity_;
+  NSString* addressState_;
+  NSString* addressZip_;
+  NSString* addressCountry_;
+  NSString* phoneWholeNumber_;
+  NSString* faxWholeNumber_;
 }
 
 // |summary| is a derived property based on |firstName|, |lastName| and
@@ -53,16 +49,12 @@ class AutoFillProfile;
 @property (nonatomic, copy) NSString* companyName;
 @property (nonatomic, copy) NSString* addressLine1;
 @property (nonatomic, copy) NSString* addressLine2;
-@property (nonatomic, copy) NSString* city;
-@property (nonatomic, copy) NSString* state;
-@property (nonatomic, copy) NSString* zip;
-@property (nonatomic, copy) NSString* country;
-@property (nonatomic, copy) NSString* phoneCountryCode;
-@property (nonatomic, copy) NSString* phoneAreaCode;
-@property (nonatomic, copy) NSString* phoneNumber;
-@property (nonatomic, copy) NSString* faxCountryCode;
-@property (nonatomic, copy) NSString* faxAreaCode;
-@property (nonatomic, copy) NSString* faxNumber;
+@property (nonatomic, copy) NSString* addressCity;
+@property (nonatomic, copy) NSString* addressState;
+@property (nonatomic, copy) NSString* addressZip;
+@property (nonatomic, copy) NSString* addressCountry;
+@property (nonatomic, copy) NSString* phoneWholeNumber;
+@property (nonatomic, copy) NSString* faxWholeNumber;
 
 // The designated initializer. Initializes the property strings to values
 // retrieved from the |profile|.
diff --git a/chrome/browser/autofill/autofill_address_model_mac.mm b/chrome/browser/autofill/autofill_address_model_mac.mm
index 2e70050..a3b2089 100644
--- a/chrome/browser/autofill/autofill_address_model_mac.mm
+++ b/chrome/browser/autofill/autofill_address_model_mac.mm
@@ -19,16 +19,12 @@
 @synthesize companyName = companyName_;
 @synthesize addressLine1 = addressLine1_;
 @synthesize addressLine2 = addressLine2_;
-@synthesize city = city_;
-@synthesize state = state_;
-@synthesize zip = zip_;
-@synthesize country = country_;
-@synthesize phoneCountryCode = phoneCountryCode_;
-@synthesize phoneAreaCode = phoneAreaCode_;
-@synthesize phoneNumber = phoneNumber_;
-@synthesize faxCountryCode = faxCountryCode_;
-@synthesize faxAreaCode = faxAreaCode_;
-@synthesize faxNumber = faxNumber_;
+@synthesize addressCity = addressCity_;
+@synthesize addressState = addressState_;
+@synthesize addressZip = addressZip_;
+@synthesize addressCountry = addressCountry_;
+@synthesize phoneWholeNumber = phoneWholeNumber_;
+@synthesize faxWholeNumber = faxWholeNumber_;
 
 // Sets up the KVO dependency between "summary" and dependent fields.
 + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key {
@@ -59,26 +55,18 @@
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)))];
     [self setAddressLine2:SysUTF16ToNSString(
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)))];
-    [self setCity:SysUTF16ToNSString(
+    [self setAddressCity:SysUTF16ToNSString(
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_CITY)))];
-    [self setState:SysUTF16ToNSString(
+    [self setAddressState:SysUTF16ToNSString(
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_STATE)))];
-    [self setZip:SysUTF16ToNSString(
+    [self setAddressZip:SysUTF16ToNSString(
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)))];
-    [self setCountry:SysUTF16ToNSString(
+    [self setAddressCountry:SysUTF16ToNSString(
         profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)))];
-    [self setPhoneCountryCode:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_HOME_COUNTRY_CODE)))];
-    [self setPhoneAreaCode:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_HOME_CITY_CODE)))];
-    [self setPhoneNumber:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_HOME_NUMBER)))];
-    [self setFaxCountryCode:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_FAX_COUNTRY_CODE)))];
-    [self setFaxAreaCode:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_FAX_CITY_CODE)))];
-    [self setFaxNumber:SysUTF16ToNSString(
-        profile.GetFieldText(AutoFillType(PHONE_FAX_NUMBER)))];
+    [self setPhoneWholeNumber:SysUTF16ToNSString(
+        profile.GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER)))];
+    [self setFaxWholeNumber:SysUTF16ToNSString(
+        profile.GetFieldText(AutoFillType(PHONE_FAX_WHOLE_NUMBER)))];
   }
   return self;
 }
@@ -92,16 +80,12 @@
   [companyName_ release];
   [addressLine1_ release];
   [addressLine2_ release];
-  [city_ release];
-  [state_ release];
-  [zip_ release];
-  [country_ release];
-  [phoneCountryCode_ release];
-  [phoneAreaCode_ release];
-  [phoneNumber_ release];
-  [faxCountryCode_ release];
-  [faxAreaCode_ release];
-  [faxNumber_ release];
+  [addressCity_ release];
+  [addressState_ release];
+  [addressZip_ release];
+  [addressCountry_ release];
+  [phoneWholeNumber_ release];
+  [faxWholeNumber_ release];
   [super dealloc];
 }
 
@@ -130,25 +114,17 @@
   profile->SetInfo(AutoFillType(ADDRESS_HOME_LINE2),
       base::SysNSStringToUTF16([self addressLine2]));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_CITY),
-      base::SysNSStringToUTF16([self city]));
+      base::SysNSStringToUTF16([self addressCity]));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_STATE),
-      base::SysNSStringToUTF16([self state]));
+      base::SysNSStringToUTF16([self addressState]));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_ZIP),
-      base::SysNSStringToUTF16([self zip]));
+      base::SysNSStringToUTF16([self addressZip]));
   profile->SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY),
-      base::SysNSStringToUTF16([self country]));
-  profile->SetInfo(AutoFillType(PHONE_HOME_COUNTRY_CODE),
-      base::SysNSStringToUTF16([self phoneCountryCode]));
-  profile->SetInfo(AutoFillType(PHONE_HOME_CITY_CODE),
-      base::SysNSStringToUTF16([self phoneAreaCode]));
-  profile->SetInfo(AutoFillType(PHONE_HOME_NUMBER),
-      base::SysNSStringToUTF16([self phoneNumber]));
-  profile->SetInfo(AutoFillType(PHONE_FAX_COUNTRY_CODE),
-      base::SysNSStringToUTF16([self faxCountryCode]));
-  profile->SetInfo(AutoFillType(PHONE_FAX_CITY_CODE),
-      base::SysNSStringToUTF16([self faxAreaCode]));
-  profile->SetInfo(AutoFillType(PHONE_FAX_NUMBER),
-      base::SysNSStringToUTF16([self faxNumber]));
+      base::SysNSStringToUTF16([self addressCountry]));
+  profile->SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER),
+      base::SysNSStringToUTF16([self phoneWholeNumber]));
+  profile->SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER),
+      base::SysNSStringToUTF16([self faxWholeNumber]));
 }
 
 @end
diff --git a/chrome/browser/autofill/autofill_address_model_mac_unittest.mm b/chrome/browser/autofill/autofill_address_model_mac_unittest.mm
index 882d31e..9265e04 100644
--- a/chrome/browser/autofill/autofill_address_model_mac_unittest.mm
+++ b/chrome/browser/autofill/autofill_address_model_mac_unittest.mm
@@ -4,21 +4,17 @@
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
+#include "chrome/browser/autofill/autofill_common_unittest.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-class AutoFillAddressModelTest : public CocoaTest {
- public:
-  AutoFillAddressModelTest() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillAddressModelTest);
-};
+typedef CocoaTest AutoFillAddressModelTest;
 
-TEST_F(AutoFillAddressModelTest, Basic) {
+TEST(AutoFillAddressModelTest, Basic) {
   // A basic test that creates a new instance and releases.
   // Aids valgrind leak detection.
   AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
@@ -27,4 +23,108 @@ TEST_F(AutoFillAddressModelTest, Basic) {
   EXPECT_TRUE(model.get());
 }
 
+TEST(AutoFillAddressModelTest, InitializationFromProfile) {
+  AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
+  autofill_unittest::SetProfileInfo(
+      &profile,
+      "Billing",
+      "Marion",
+      "Mitchell",
+      "Morrison",
+      "johnwayne@me.xyz",
+      "Fox",
+      "123 Zoo St.",
+      "unit 5",
+      "Hollywood", "CA",
+      "91601",
+      "US",
+      "12345678910",
+      "01987654321");
+  scoped_nsobject<AutoFillAddressModel> model([[AutoFillAddressModel alloc]
+      initWithProfile:profile]);
+  EXPECT_TRUE(model.get());
+
+  EXPECT_TRUE([[model label] isEqualToString:@"Billing"]);
+  EXPECT_TRUE([[model firstName] isEqualToString:@"Marion"]);
+  EXPECT_TRUE([[model middleName] isEqualToString:@"Mitchell"]);
+  EXPECT_TRUE([[model lastName] isEqualToString:@"Morrison"]);
+  EXPECT_TRUE([[model email] isEqualToString:@"johnwayne@me.xyz"]);
+  EXPECT_TRUE([[model companyName] isEqualToString:@"Fox"]);
+  EXPECT_TRUE([[model addressLine1] isEqualToString:@"123 Zoo St."]);
+  EXPECT_TRUE([[model addressLine2] isEqualToString:@"unit 5"]);
+  EXPECT_TRUE([[model addressCity] isEqualToString:@"Hollywood"]);
+  EXPECT_TRUE([[model addressState] isEqualToString:@"CA"]);
+  EXPECT_TRUE([[model addressZip] isEqualToString:@"91601"]);
+  EXPECT_TRUE([[model addressCountry] isEqualToString:@"US"]);
+  EXPECT_TRUE([[model phoneWholeNumber] isEqualToString:@"12345678910"]);
+  EXPECT_TRUE([[model faxWholeNumber] isEqualToString:@"01987654321"]);
 }
+
+TEST(AutoFillAddressModelTest, CopyModelToProfile) {
+  AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
+  autofill_unittest::SetProfileInfo(
+      &profile,
+      "Billing",
+      "Marion",
+      "Mitchell",
+      "Morrison",
+      "johnwayne@me.xyz",
+      "Fox",
+      "123 Zoo St.",
+      "unit 5",
+      "Hollywood", "CA",
+      "91601",
+      "US",
+      "12345678910",
+      "01987654321");
+  scoped_nsobject<AutoFillAddressModel> model([[AutoFillAddressModel alloc]
+      initWithProfile:profile]);
+  EXPECT_TRUE(model.get());
+
+  [model setLabel:@"BillingX"];
+  [model setFirstName:@"MarionX"];
+  [model setMiddleName:@"MitchellX"];
+  [model setLastName:@"MorrisonX"];
+  [model setEmail:@"trigger@me.xyz"];
+  [model setCompanyName:@"FoxX"];
+  [model setAddressLine1:@"123 Xoo St."];
+  [model setAddressLine2:@"unit 5X"];
+  [model setAddressCity:@"Seattle"];
+  [model setAddressState:@"WA"];
+  [model setAddressZip:@"81601"];
+  [model setAddressCountry:@"CA"];
+  [model setPhoneWholeNumber:@"23346678910"];
+  [model setFaxWholeNumber:@"12988654321"];
+
+  [model copyModelToProfile:&profile];
+
+  EXPECT_EQ(ASCIIToUTF16("BillingX"), profile.Label());
+  EXPECT_EQ(ASCIIToUTF16("MarionX"),
+            profile.GetFieldText(AutoFillType(NAME_FIRST)));
+  EXPECT_EQ(ASCIIToUTF16("MitchellX"),
+            profile.GetFieldText(AutoFillType(NAME_MIDDLE)));
+  EXPECT_EQ(ASCIIToUTF16("MorrisonX"),
+            profile.GetFieldText(AutoFillType(NAME_LAST)));
+  EXPECT_EQ(ASCIIToUTF16("trigger@me.xyz"),
+            profile.GetFieldText(AutoFillType(EMAIL_ADDRESS)));
+  EXPECT_EQ(ASCIIToUTF16("FoxX"),
+            profile.GetFieldText(AutoFillType(COMPANY_NAME)));
+  EXPECT_EQ(ASCIIToUTF16("123 Xoo St."),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)));
+  EXPECT_EQ(ASCIIToUTF16("unit 5X"),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)));
+  EXPECT_EQ(ASCIIToUTF16("Seattle"),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_CITY)));
+  EXPECT_EQ(ASCIIToUTF16("WA"),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_STATE)));
+  EXPECT_EQ(ASCIIToUTF16("81601"),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)));
+  EXPECT_EQ(ASCIIToUTF16("CA"),
+            profile.GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)));
+  EXPECT_EQ(ASCIIToUTF16("23346678910"),
+            profile.GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER)));
+  EXPECT_EQ(ASCIIToUTF16("12988654321"),
+            profile.GetFieldText(AutoFillType(PHONE_FAX_WHOLE_NUMBER)));
+}
+
+}  // namespace
diff --git a/chrome/browser/autofill/autofill_address_view_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_address_view_controller_mac_unittest.mm
index 2206b40..b5c857c 100644
--- a/chrome/browser/autofill/autofill_address_view_controller_mac_unittest.mm
+++ b/chrome/browser/autofill/autofill_address_view_controller_mac_unittest.mm
@@ -10,15 +10,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-class AutoFillAddressViewControllerTest : public CocoaTest {
- public:
-  AutoFillAddressViewControllerTest() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillAddressViewControllerTest);
-};
+typedef CocoaTest AutoFillAddressViewControllerTest;
 
-TEST_F(AutoFillAddressViewControllerTest, Basic) {
+TEST(AutoFillAddressViewControllerTest, Basic) {
   // A basic test that creates a new instance and releases.
   // Aids valgrind leak detection.
   AutoFillProfile profile(ASCIIToUTF16("Home"), 0);
@@ -30,4 +25,4 @@ TEST_F(AutoFillAddressViewControllerTest, Basic) {
   EXPECT_TRUE(controller.get());
 }
 
-}
+}  // namespace
diff --git a/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm b/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm
index 18650573..6fdb1142 100644
--- a/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm
+++ b/chrome/browser/autofill/autofill_credit_card_model_mac_unittest.mm
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/scoped_nsobject.h"
+#include "chrome/browser/autofill/autofill_common_unittest.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
@@ -10,15 +11,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-class AutoFillCreditCardModelTest : public CocoaTest {
- public:
-  AutoFillCreditCardModelTest() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillCreditCardModelTest);
-};
+typedef CocoaTest AutoFillCreditCardModelTest;
 
-TEST_F(AutoFillCreditCardModelTest, Basic) {
+TEST(AutoFillCreditCardModelTest, Basic) {
   // A basic test that creates a new instance and releases.
   // Aids valgrind leak detection.
   CreditCard credit_card(ASCIIToUTF16("myCC"), 0);
@@ -27,4 +23,76 @@ TEST_F(AutoFillCreditCardModelTest, Basic) {
   EXPECT_TRUE(model.get());
 }
 
+TEST(AutoFillCreditCardModelTest, InitializationFromCreditCard) {
+  CreditCard credit_card(string16(), 0);
+  autofill_unittest::SetCreditCardInfo(
+      &credit_card,
+      "Corporate",
+      "John Dillinger",
+      "Visa",
+      "123456789012",
+      "01",
+      "2010",
+      "123",
+      "Chicago",
+      "Indianapolis");
+  scoped_nsobject<AutoFillCreditCardModel> model(
+      [[AutoFillCreditCardModel alloc] initWithCreditCard:credit_card]);
+  EXPECT_TRUE(model.get());
+
+  EXPECT_TRUE([[model label] isEqualToString:@"Corporate"]);
+  EXPECT_TRUE([[model nameOnCard] isEqualToString:@"John Dillinger"]);
+  EXPECT_TRUE([[model creditCardNumber] isEqualToString:@"123456789012"]);
+  EXPECT_TRUE([[model expirationMonth] isEqualToString:@"01"]);
+  EXPECT_TRUE([[model expirationYear] isEqualToString:@"2010"]);
+  EXPECT_TRUE([[model cvcCode] isEqualToString:@"123"]);
+  EXPECT_TRUE([[model billingAddress] isEqualToString:@"Chicago"]);
+  EXPECT_TRUE([[model shippingAddress] isEqualToString:@"Indianapolis"]);
 }
+
+TEST(AutoFillCreditCardModelTest, CopyModelToCreditCard) {
+  CreditCard credit_card(string16(), 0);
+  autofill_unittest::SetCreditCardInfo(
+      &credit_card,
+      "Corporate",
+      "John Dillinger",
+      "Visa",
+      "123456789012",
+      "01",
+      "2010",
+      "123",
+      "Chicago",
+      "Indianapolis");
+  scoped_nsobject<AutoFillCreditCardModel> model(
+      [[AutoFillCreditCardModel alloc] initWithCreditCard:credit_card]);
+  EXPECT_TRUE(model.get());
+
+  [model setLabel:@"CorporateX"];
+  [model setNameOnCard:@"John DillingerX"];
+  [model setCreditCardNumber:@"223456789012"];
+  [model setExpirationMonth:@"11"];
+  [model setExpirationYear:@"2011"];
+  [model setCvcCode:@"223"];
+  [model setBillingAddress:@"New York"];
+  [model setShippingAddress:@"Boston"];
+
+  [model copyModelToCreditCard:&credit_card];
+
+  EXPECT_EQ(ASCIIToUTF16("CorporateX"), credit_card.Label());
+  EXPECT_EQ(ASCIIToUTF16("John DillingerX"),
+            credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NAME)));
+  EXPECT_EQ(ASCIIToUTF16("223456789012"),
+            credit_card.GetFieldText(AutoFillType(CREDIT_CARD_NUMBER)));
+  EXPECT_EQ(ASCIIToUTF16("11"),
+            credit_card.GetFieldText(AutoFillType(CREDIT_CARD_EXP_MONTH)));
+  EXPECT_EQ(ASCIIToUTF16("2011"),
+            credit_card.GetFieldText(
+                AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
+  EXPECT_EQ(ASCIIToUTF16("223"),
+            credit_card.GetFieldText(
+                AutoFillType(CREDIT_CARD_VERIFICATION_CODE)));
+  EXPECT_EQ(ASCIIToUTF16("New York"), credit_card.billing_address());
+  EXPECT_EQ(ASCIIToUTF16("Boston"), credit_card.shipping_address());
+}
+
+}  // namespace
diff --git a/chrome/browser/autofill/autofill_credit_card_view_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_credit_card_view_controller_mac_unittest.mm
index 9caadae..8724f4b 100644
--- a/chrome/browser/autofill/autofill_credit_card_view_controller_mac_unittest.mm
+++ b/chrome/browser/autofill/autofill_credit_card_view_controller_mac_unittest.mm
@@ -10,15 +10,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-class AutoFillCreditCardViewControllerTest : public CocoaTest {
- public:
-  AutoFillCreditCardViewControllerTest() {}
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutoFillCreditCardViewControllerTest);
-};
+typedef CocoaTest AutoFillCreditCardViewControllerTest;
 
-TEST_F(AutoFillCreditCardViewControllerTest, HelloWorld) {
+TEST(AutoFillCreditCardViewControllerTest, Basic) {
   // A basic test that creates a new instance and releases.
   // Aids valgrind leak detection.
   CreditCard credit_card(ASCIIToUTF16("myCC"), 0);
@@ -30,4 +25,4 @@ TEST_F(AutoFillCreditCardViewControllerTest, HelloWorld) {
   EXPECT_TRUE(controller.get());
 }
 
-}
+}  // namespace
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm
index 0022862..8668c7a2 100644
--- a/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm
+++ b/chrome/browser/autofill/autofill_dialog_controller_mac_unittest.mm
@@ -151,12 +151,8 @@ TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) {
   profile.SetInfo(AutoFillType(ADDRESS_HOME_STATE), ASCIIToUTF16("CA"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_ZIP), ASCIIToUTF16("94111"));
   profile.SetInfo(AutoFillType(ADDRESS_HOME_COUNTRY), ASCIIToUTF16("USA"));
-  profile.SetInfo(AutoFillType(PHONE_HOME_COUNTRY_CODE), ASCIIToUTF16("01"));
-  profile.SetInfo(AutoFillType(PHONE_HOME_CITY_CODE), ASCIIToUTF16("415"));
-  profile.SetInfo(AutoFillType(PHONE_HOME_NUMBER), ASCIIToUTF16("5552258"));
-  profile.SetInfo(AutoFillType(PHONE_FAX_COUNTRY_CODE), ASCIIToUTF16("02"));
-  profile.SetInfo(AutoFillType(PHONE_FAX_CITY_CODE), ASCIIToUTF16("408"));
-  profile.SetInfo(AutoFillType(PHONE_FAX_NUMBER), ASCIIToUTF16("7172258"));
+  profile.SetInfo(AutoFillType(PHONE_HOME_WHOLE_NUMBER), ASCIIToUTF16("014155552258"));
+  profile.SetInfo(AutoFillType(PHONE_FAX_WHOLE_NUMBER), ASCIIToUTF16("024087172258"));
   profiles_.push_back(&profile);
 
   LoadDialog();
@@ -171,15 +167,11 @@ TEST_F(AutoFillDialogControllerTest, AutoFillDataMutation) {
   EXPECT_TRUE([[am companyName] isEqualToString:@"Google Inc."]);
   EXPECT_TRUE([[am addressLine1] isEqualToString:@"1122 Mountain View Road"]);
   EXPECT_TRUE([[am addressLine2] isEqualToString:@"Suite #1"]);
-  EXPECT_TRUE([[am city] isEqualToString:@"Mountain View"]);
-  EXPECT_TRUE([[am state] isEqualToString:@"CA"]);
-  EXPECT_TRUE([[am zip] isEqualToString:@"94111"]);
-  EXPECT_TRUE([[am phoneCountryCode] isEqualToString:@"01"]);
-  EXPECT_TRUE([[am phoneAreaCode] isEqualToString:@"415"]);
-  EXPECT_TRUE([[am phoneNumber] isEqualToString:@"5552258"]);
-  EXPECT_TRUE([[am faxCountryCode] isEqualToString:@"02"]);
-  EXPECT_TRUE([[am faxAreaCode] isEqualToString:@"408"]);
-  EXPECT_TRUE([[am faxNumber] isEqualToString:@"7172258"]);
+  EXPECT_TRUE([[am addressCity] isEqualToString:@"Mountain View"]);
+  EXPECT_TRUE([[am addressState] isEqualToString:@"CA"]);
+  EXPECT_TRUE([[am addressZip] isEqualToString:@"94111"]);
+  EXPECT_TRUE([[am phoneWholeNumber] isEqualToString:@"014155552258"]);
+  EXPECT_TRUE([[am faxWholeNumber] isEqualToString:@"024087172258"]);
 
   [controller_ save:nil];