Adds wallet::Address::CreateAddress() for when IDs are optional (for billing addresses).

chrome/browser/autofill/wallet/wallet_address.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOFILL_WALLET_WALLET_ADDRESS_H_
 #define CHROME_BROWSER_AUTOFILL_WALLET_WALLET_ADDRESS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 82 matching lines @@
   scoped_ptr<base::DictionaryValue> ToDictionaryWithoutID() const;
 
   // Returns a string that summarizes this address, suitable for display to
   // the user.
   string16 DisplayName() const;
 
   // Returns data appropriate for |type|.
   string16 GetInfo(AutofillFieldType type) const;
 
   // Returns an empty scoped_ptr if input is invalid or a valid address that is
-  // selectable for Google Wallet use.
-  static scoped_ptr<Address>
-      CreateAddressWithID(const base::DictionaryValue& dictionary);
+  // selectable for Google Wallet use. Does not require "id" in |dictionary|.
+  // IDs are not currently required or returns for billing addresses not in a

[ahutter, 2013/03/04 21:35:52]

"or returned for billing addresses."?

[Dan Beam, 2013/03/04 21:50:53]

Done.

+  // FullWallet.
+  static scoped_ptr<Address> CreateAddress(
+      const base::DictionaryValue& dictionary);
+
+  // Returns an empty scoped_ptr if input is invalid or a valid address that is
+  // selectable for Google Wallet use. Requires "id" in |dictionary|. IDs are
+  // required for shipping address and billing addresses in a FullWallet.

[ahutter, 2013/03/04 21:35:52]

"required for shipping addresses."?

[Dan Beam, 2013/03/04 21:50:53]

Done.

+  static scoped_ptr<Address> CreateAddressWithID(
+      const base::DictionaryValue& dictionary);
 
   // Returns an empty scoped_ptr if input in invalid or a valid address that
   // can only be used for displaying to the user.
-  static scoped_ptr<Address>
-      CreateDisplayAddress(const base::DictionaryValue& dictionary);
+  static scoped_ptr<Address> CreateDisplayAddress(
+      const base::DictionaryValue& dictionary);
 
   bool operator==(const Address& other) const;
   bool operator!=(const Address& other) const;
 
  private:
   // |country_name_code_| should be an ISO 3166-1-alpha-2 (two letter codes, as
   // used in DNS). For example, "GB".
   std::string country_name_code_;
 
   // The recipient's name. For example "John Doe".
@@ skipping 28 matching lines @@
   // Externalized Online Wallet id for this address.
   std::string object_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Address);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_AUTOFILL_WALLET_WALLET_ADDRESS_H_