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

chrome/browser/autofill/wallet/wallet_items.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_ITEMS_H_
 #define CHROME_BROWSER_AUTOFILL_WALLET_WALLET_ITEMS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "chrome/browser/autofill/wallet/required_action.h"
 #include "chrome/browser/autofill/wallet/wallet_address.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace wallet {
 
 class WalletItemsTest;
 
-// WalletItems primarily serves as a container for the user's instruments and
-// address, however, it also provides a transaction id which must be used
-// throughout all API calls being made using this data. Additionally, user
-// actions may be required before a purchase can be completed using Online
-// Wallet and those actions are present in the object as well.
+// WalletItems is a collection of cards and addresses that a user picks from to
+// construct a full wallet. However, it also provides a transaction ID which
+// must be used throughout all API calls being made using this data.
+// Additionally, user actions may be required before a purchase can be completed
+// using Online Wallet and those actions are present in the object as well.
 class WalletItems {
  public:
   // Container for all information about a credit card except for it's card
   // verfication number (CVN) and it's complete primary account number (PAN).
   class MaskedInstrument {
    public:
     enum Type {
       AMEX,
       DISCOVER,
       MAESTRO,
@@ skipping 110 matching lines @@
     instruments_.push_back(instrument.release());
   }
   void AddAddress(scoped_ptr<Address> address) {
     DCHECK(address.get());
     addresses_.push_back(address.release());
   }
   void AddLegalDocument(scoped_ptr<LegalDocument> legal_document) {
     DCHECK(legal_document.get());
     legal_documents_.push_back(legal_document.release());
   }
-  const std::vector<std::string>& required_actions() const {
+  const std::vector<RequiredAction>& required_actions() const {
     return required_actions_;
   }
   const std::string& google_transaction_id() const {
     return google_transaction_id_;
   }
   const std::vector<MaskedInstrument*>& instruments() const {
     return instruments_.get();
   }
   const std::string& default_instrument_id() const {
     return default_instrument_id_;
   }
   const std::vector<Address*>& addresses() const { return addresses_.get(); }
   const std::string& default_address_id() const {
     return default_address_id_;
   }
   const std::vector<LegalDocument*>& legal_documents() const {
     return legal_documents_.get();
   }
 
  private:
   friend class WalletItemsTest;
   FRIEND_TEST_ALL_PREFIXES(WalletItemsTest, CreateWalletItems);
   FRIEND_TEST_ALL_PREFIXES(WalletItemsTest,
                            CreateWalletItemsWithRequiredActions);
-  WalletItems(const std::vector<std::string>& required_actions,
+  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);
   // Actions that must be completed by the user before a FullWallet can be
   // issued to them by the Online Wallet service.
-  // TODO(ahutter): |required_actions_| should be members of an enum not
-  // strings. See http://crbug.com/165195.
-  std::vector<std::string> required_actions_;
+  std::vector<RequiredAction> required_actions_;
   std::string google_transaction_id_;
   std::string default_instrument_id_;
   std::string default_address_id_;
   ScopedVector<MaskedInstrument> instruments_;
   ScopedVector<Address> addresses_;
   ScopedVector<LegalDocument> legal_documents_;
   DISALLOW_COPY_AND_ASSIGN(WalletItems);
 };
 
 }  // namespace wallet
 
 #endif  // CHROME_BROWSER_AUTOFILL_WALLET_WALLET_ITEMS_H_