Interactive autofill: Handle Online Wallet being unavailable.

chrome/browser/autofill/wallet/wallet_client.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_client.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 226 matching lines @@
     request_dict.SetString("reason", AutocheckoutStatusToString(status));
   }
   request_dict.SetString("google_transaction_id", google_transaction_id);
 
   std::string post_body;
   base::JSONWriter::Write(&request_dict, &post_body);
 
   MakeWalletRequest(GetSendStatusUrl(), post_body, observer, kJsonMimeType);
 }
 
+bool WalletClient::IsRequestInProgress() const {
+  return request_.get() != NULL;
+}
+
 void WalletClient::MakeWalletRequest(const GURL& url,
                                      const std::string& post_body,
                                      WalletClientObserver* observer,
                                      const std::string& content_type) {
-  DCHECK(!request_.get()) << "Tried to fetch two things at once!";
+  DCHECK(!IsRequestInProgress()) << "Tried to fetch two things at once!";

[Ilya Sherman, 2013/02/11 06:07:01]

nit: As long as you're here, please remove the logging output.  (Feel free to
move it to a comment if you like.)

[Dan Beam, 2013/02/11 21:53:54]

Done.

   DCHECK(observer);
 
   observer_ = observer;
 
   request_.reset(net::URLFetcher::Create(
       0, url, net::URLFetcher::POST, this));
   request_->SetRequestContext(context_getter_);
   DVLOG(1) << "url=" << url << ", post_body=" << post_body
            << ", content_type=" << content_type;
   request_->SetUploadData(content_type, post_body);
@@ skipping 155 matching lines @@
     : context_getter_(context_getter),
       observer_(NULL),
       request_type_(NO_PENDING_REQUEST) {
   DCHECK(context_getter);
 }
 
 WalletClient::~WalletClient() {}
 
 }  // namespace wallet