Adds wallet::RequiredAction for when we start interacting with Online Wallet.

chrome/browser/autofill/wallet/wallet_items.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 "chrome/browser/autofill/wallet/wallet_items.h"
 
 #include "base/logging.h"
 #include "base/values.h"
+#include "chrome/browser/autofill/wallet/required_action.h"
 
 namespace {
 
 wallet::WalletItems::MaskedInstrument::Type
     TypeFromString(const std::string& type_string) {
   if (type_string == "VISA")
     return wallet::WalletItems::MaskedInstrument::VISA;
   if (type_string == "MASTER_CARD")
     return wallet::WalletItems::MaskedInstrument::MASTER_CARD;
   if (type_string == "AMEX")
@@ skipping 217 matching lines @@
 bool WalletItems::LegalDocument::operator==(const LegalDocument& other) const {
   return document_id_ == other.document_id_ &&
          display_name_ == other.display_name_ &&
          document_body_ == other.document_body_;
 }
 
 bool WalletItems::LegalDocument::operator!=(const LegalDocument& other) const {
   return !(*this == other);
 }
 
-WalletItems::WalletItems(const std::vector<std::string>& required_actions,
+WalletItems::WalletItems(const std::vector<RequiredAction>& required_actions,
                          const std::string& google_transaction_id,
                          const std::string& default_instrument_id,
                          const std::string& default_address_id)
     : required_actions_(required_actions),
       google_transaction_id_(google_transaction_id),
       default_instrument_id_(default_instrument_id),
       default_address_id_(default_address_id) {}
 
 WalletItems::~WalletItems() {}
 
 scoped_ptr<WalletItems>
     WalletItems::CreateWalletItems(const base::DictionaryValue& dictionary) {
   std::string google_transaction_id;
   if (!dictionary.GetString("google_transaction_id", &google_transaction_id)) {
     DLOG(ERROR) << "Response from Google wallet missing google transaction id";
     return scoped_ptr<WalletItems>();
   }
 
-  std::vector<std::string> required_action;
+  std::vector<RequiredAction> required_action;
   const ListValue* required_action_list;
   if (dictionary.GetList("required_action", &required_action_list)) {
     for (size_t i = 0; i < required_action_list->GetSize(); ++i) {
-      std::string action;
-      if (required_action_list->GetString(i, &action))
+      std::string action_string;
+      if (required_action_list->GetString(i, &action_string)) {
+        RequiredAction action = ParseRequiredActionFromString(action_string);
+        if (!ActionAppliesToWalletItems(action)) {
+          DLOG(ERROR) << "Response from Google wallet with bad required action";

[ahutter, 2013/01/07 18:36:13]

ditto.

[Dan Beam, 2013/01/07 18:52:02]

Done.

+          return scoped_ptr<WalletItems>();
+        }
         required_action.push_back(action);
+      }
     }
   } else {
     DVLOG(1) << "Response from Google wallet missing required actions";
   }
 
   std::string default_instrument_id;
   if (!dictionary.GetString("default_instrument_id", &default_instrument_id))
     DVLOG(1) << "Response from Google wallet missing default instrument id";
 
   std::string default_address_id;
@@ skipping 60 matching lines @@
   }
 
   return wallet_items.Pass();
 }
 
 bool WalletItems::operator==(const WalletItems& other) const {
   // TODO(ahutter): Check scoped vector equality.
   return google_transaction_id_ == other.google_transaction_id_ &&
          default_instrument_id_ == other.default_instrument_id_ &&
          default_address_id_ == other.default_address_id_ &&
-         required_actions_ == required_actions_;
+         required_actions_ == other.required_actions_;
 }
 
 bool WalletItems::operator!=(const WalletItems& other) const {
   return !(*this == other);
 }
 
 }  // namespace wallet