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

chrome/browser/autofill/wallet/wallet_address_unittest.cc

 // 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.
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/wallet/wallet_address.h"
@@ skipping 148 matching lines @@
  protected:
   void SetUpDictionary(const std::string& json) {
     scoped_ptr<Value> value(base::JSONReader::Read(json));
     DCHECK(value.get());
     DCHECK(value->IsType(Value::TYPE_DICTIONARY));
     dict_.reset(static_cast<DictionaryValue*>(value.release()));
   }
   scoped_ptr<const DictionaryValue> dict_;
 };
 
+TEST_F(WalletAddressTest, CreateAddressMissingObjectId) {
+  SetUpDictionary(kAddressMissingObjectId);
+  Address address("country_name_code",
+                  ASCIIToUTF16("recipient_name"),
+                  ASCIIToUTF16("address_line_1"),
+                  ASCIIToUTF16("address_line_2"),
+                  ASCIIToUTF16("locality_name"),
+                  ASCIIToUTF16("administrative_area_name"),
+                  ASCIIToUTF16("postal_code_number"),
+                  ASCIIToUTF16("phone_number"),
+                  "");
+  ASSERT_EQ(address, *Address::CreateAddress(*dict_));
+}
+
 TEST_F(WalletAddressTest, CreateAddressWithIDMissingObjectId) {
   SetUpDictionary(kAddressMissingObjectId);
   ASSERT_EQ(NULL, Address::CreateAddressWithID(*dict_).get());
 }
 
-TEST_F(WalletAddressTest, CreateAddressWithIDMissingCountryNameCode) {
+TEST_F(WalletAddressTest, CreateAddressMissingCountryNameCode) {
   SetUpDictionary(kAddressMissingCountryNameCode);
+  ASSERT_EQ(NULL, Address::CreateAddress(*dict_).get());
   ASSERT_EQ(NULL, Address::CreateAddressWithID(*dict_).get());
 }
 
-TEST_F(WalletAddressTest, CreateAddressWithIDMissingRecipientName) {
+TEST_F(WalletAddressTest, CreateAddressMissingRecipientName) {
   SetUpDictionary(kAddressMissingRecipientName);
+  ASSERT_EQ(NULL, Address::CreateAddress(*dict_).get());
   ASSERT_EQ(NULL, Address::CreateAddressWithID(*dict_).get());
 }
 
-TEST_F(WalletAddressTest, CreateAddressWithIDMissingPostalCodeNumber) {
+TEST_F(WalletAddressTest, CreateAddressMissingPostalCodeNumber) {
   SetUpDictionary(kAddressMissingPostalCodeNumber);
+  ASSERT_EQ(NULL, Address::CreateAddress(*dict_).get());
   ASSERT_EQ(NULL, Address::CreateAddressWithID(*dict_).get());
 }
 
 TEST_F(WalletAddressTest, CreateAddressWithID) {
   SetUpDictionary(kValidAddress);
   Address address("country_name_code",
                   ASCIIToUTF16("recipient_name"),
                   ASCIIToUTF16("address_line_1"),
                   ASCIIToUTF16("address_line_2"),
                   ASCIIToUTF16("locality_name"),
                   ASCIIToUTF16("administrative_area_name"),
                   ASCIIToUTF16("postal_code_number"),
                   ASCIIToUTF16("phone_number"),
                   "id");
+  ASSERT_EQ(address, *Address::CreateAddress(*dict_));
   ASSERT_EQ(address, *Address::CreateAddressWithID(*dict_));
 }
 
 TEST_F(WalletAddressTest, CreateDisplayAddressMissingCountryNameCode) {
   SetUpDictionary(kClientAddressMissingCountryCode);
   ASSERT_EQ(NULL, Address::CreateDisplayAddress(*dict_).get());
 }
 
 TEST_F(WalletAddressTest, CreateDisplayAddressMissingName) {
   SetUpDictionary(kClientAddressMissingName);
@@ skipping 76 matching lines @@
                   ASCIIToUTF16("administrative_area_name"),
                   ASCIIToUTF16("postal_code_number"),
                   ASCIIToUTF16("phone_number"),
                   "id");
 
   EXPECT_TRUE(expected.Equals(address.ToDictionaryWithID().get()));
 }
 
 }  // namespace wallet
 }  // namespace autofill