rAc: Get rid of dialog type in rAc, there is only one type left now.

components/autofill/content/browser/wallet/wallet_client_unittest.cc

 // Copyright 2013 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/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 563 matching lines @@
         "\"upgraded_instrument_id\":\"instrument_id\","
         "\"use_minimal_addresses\":false"
     "}";
 
 class MockAutofillMetrics : public AutofillMetrics {
  public:
   MockAutofillMetrics() {}
   MOCK_CONST_METHOD2(LogWalletApiCallDuration,
                      void(WalletApiCallMetric metric,
                           const base::TimeDelta& duration));
-  MOCK_CONST_METHOD2(LogWalletErrorMetric,
-                     void(DialogType dialog_type, WalletErrorMetric metric));
-  MOCK_CONST_METHOD2(LogWalletRequiredActionMetric,
-                     void(DialogType dialog_type,
-                          WalletRequiredActionMetric action));
+  MOCK_CONST_METHOD1(LogWalletErrorMetric, void(WalletErrorMetric metric));
+  MOCK_CONST_METHOD1(LogWalletRequiredActionMetric,
+                     void(WalletRequiredActionMetric action));
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillMetrics);
 };
 
 class MockWalletClientDelegate : public WalletClientDelegate {
  public:
   MockWalletClientDelegate()
       : full_wallets_received_(0),
         wallet_items_received_(0),
         is_shipping_required_(true) {}
   ~MockWalletClientDelegate() {}
 
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
-  virtual DialogType GetDialogType() const OVERRIDE {
-    return DIALOG_TYPE_REQUEST_AUTOCOMPLETE;
-  }
-
   virtual std::string GetRiskData() const OVERRIDE {
     return "risky business";
   }
 
   virtual std::string GetWalletCookieValue() const OVERRIDE {
     return "gdToken";
   }
 
   virtual bool IsShippingAddressRequired() const OVERRIDE {
     return is_shipping_required_;
   }
 
   void SetIsShippingAddressRequired(bool is_shipping_required) {
     is_shipping_required_ = is_shipping_required;
   }
 
   void ExpectLogWalletApiCallDuration(
       AutofillMetrics::WalletApiCallMetric metric,
       size_t times) {
     EXPECT_CALL(metric_logger_,
                 LogWalletApiCallDuration(metric, testing::_)).Times(times);
   }
 
   void ExpectWalletErrorMetric(AutofillMetrics::WalletErrorMetric metric) {
-    EXPECT_CALL(
-        metric_logger_,
-        LogWalletErrorMetric(
-            DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric)).Times(1);
+    EXPECT_CALL(metric_logger_, LogWalletErrorMetric(metric)).Times(1);
   }
 
   void ExpectWalletRequiredActionMetric(
       AutofillMetrics::WalletRequiredActionMetric metric) {
-    EXPECT_CALL(
-        metric_logger_,
-        LogWalletRequiredActionMetric(
-            DIALOG_TYPE_REQUEST_AUTOCOMPLETE, metric)).Times(1);
+    EXPECT_CALL(metric_logger_,
+                LogWalletRequiredActionMetric(metric)).Times(1);
   }
 
   void ExpectBaselineMetrics() {
     EXPECT_CALL(
         metric_logger_,
         LogWalletErrorMetric(
-            DIALOG_TYPE_REQUEST_AUTOCOMPLETE,
             AutofillMetrics::WALLET_ERROR_BASELINE_ISSUED_REQUEST))
                 .Times(1);
     ExpectWalletRequiredActionMetric(
         AutofillMetrics::WALLET_REQUIRED_ACTION_BASELINE_ISSUED_REQUEST);
   }
 
   MockAutofillMetrics* metric_logger() {
     return &metric_logger_;
   }
 
@@ skipping 1052 matching lines @@
   wallet_client_->GetWalletItems(GURL(kMerchantUrl));
   EXPECT_EQ(2U, wallet_client_->pending_requests_.size());
 
   wallet_client_->CancelRequests();
   EXPECT_EQ(0U, wallet_client_->pending_requests_.size());
   EXPECT_FALSE(wallet_client_->HasRequestInProgress());
 }
 
 }  // namespace wallet
 }  // namespace autofill