[Payment Request] Adds a JourneyLogger instance to the PaymentRequest

ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm

 // Copyright 2017 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.
 
 #import "ios/chrome/browser/ui/payments/address_edit_coordinator.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/ios/wait_util.h"
 #include "base/test/scoped_task_environment.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/country_names.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/browser/test_region_data_loader.h"
 #include "components/payments/core/payments_profile_comparator.h"
 #include "components/prefs/pref_service.h"
 #include "ios/chrome/browser/application_context.h"
+#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/payments/payment_request_test_util.h"
 #include "ios/chrome/browser/payments/test_payment_request.h"
 #import "ios/chrome/browser/ui/payments/payment_request_edit_view_controller.h"
 #import "ios/chrome/browser/ui/payments/payment_request_editor_field.h"
 #import "ios/chrome/test/scoped_key_window.h"
+#import "ios/web/public/test/fakes/test_web_state.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
@@ skipping 10 matching lines @@
  public:
   MockPaymentsProfileComparator(const std::string& app_locale,
                                 const payments::PaymentOptionsProvider& options)
       : PaymentsProfileComparator(app_locale, options) {}
   MOCK_METHOD1(Invalidate, void(const autofill::AutofillProfile&));
 };
 
 class MockTestPaymentRequest : public payments::TestPaymentRequest {
  public:
   MockTestPaymentRequest(web::PaymentRequest web_payment_request,
+                         ios::ChromeBrowserState* browser_state,
+                         web::WebState* web_state,
                          autofill::PersonalDataManager* personal_data_manager)
       : payments::TestPaymentRequest(web_payment_request,
+                                     browser_state,
+                                     web_state,
                                      personal_data_manager) {}
   MOCK_METHOD1(AddAutofillProfile,
                autofill::AutofillProfile*(const autofill::AutofillProfile&));
 };
 
 MATCHER_P4(ProfileMatches, name, country, state, phone_number, "") {
   return arg.GetRawInfo(autofill::NAME_FULL) == base::ASCIIToUTF16(name) &&
          arg.GetRawInfo(autofill::ADDRESS_HOME_COUNTRY) ==
              base::ASCIIToUTF16(country) &&
          arg.GetRawInfo(autofill::ADDRESS_HOME_STATE) ==
@@ skipping 29 matching lines @@
                       required:YES],
   ];
 }
 
 using ::testing::_;
 }  // namespace
 
 class PaymentRequestAddressEditCoordinatorTest : public PlatformTest {
  protected:
   PaymentRequestAddressEditCoordinatorTest()
       : pref_service_(autofill::test::PrefServiceForTesting()) {

[please use gerrit instead, 2017/07/06 14:52:24]

chrome_browser_state_(TestChromeBrowserState::Builder().Build())

[Moe, 2017/07/07 02:24:54]

Done.

     autofill::CountryNames::SetLocaleString("en-US");
     personal_data_manager_.SetTestingPrefService(pref_service_.get());
+
+    TestChromeBrowserState::Builder test_cbs_builder;
+    chrome_browser_state_ = test_cbs_builder.Build();
+
     payment_request_ = base::MakeUnique<MockTestPaymentRequest>(
         payment_request_test_util::CreateTestWebPaymentRequest(),
-        &personal_data_manager_);
+        chrome_browser_state_.get(), &web_state_, &personal_data_manager_);
 
     profile_comparator_ = base::MakeUnique<MockPaymentsProfileComparator>(
         GetApplicationContext()->GetApplicationLocale(),
         *payment_request_.get());
     payment_request_->SetProfileComparator(profile_comparator_.get());
 
     test_region_data_loader_.set_synchronous_callback(true);
     payment_request_->SetRegionDataLoader(&test_region_data_loader_);
   }
 
   void TearDown() override {
     personal_data_manager_.SetTestingPrefService(nullptr);
   }
 
   base::test::ScopedTaskEnvironment scoped_task_evironment_;
 
+  web::TestWebState web_state_;
   std::unique_ptr<PrefService> pref_service_;
   MockTestPersonalDataManager personal_data_manager_;
   autofill::TestRegionDataLoader test_region_data_loader_;
   std::unique_ptr<MockPaymentsProfileComparator> profile_comparator_;
   std::unique_ptr<MockTestPaymentRequest> payment_request_;
+  std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;

[please use gerrit instead, 2017/07/06 14:52:24]

payment_request_ uses chrome_browser_state_, so let's put chrome_browser_state_
before payment_request_. C++ destruction order bottom-up, so
chrome_browser_state_ will be deleted before payment_request_, which violates
your assumptions, I believe.

[Moe, 2017/07/07 02:24:54]

You have a point. Done.

 };
 
 // Tests that invoking start and stop on the coordinator presents and dismisses
 // the address edit view controller, respectively.
 TEST_F(PaymentRequestAddressEditCoordinatorTest, StartAndStop) {
   UIViewController* base_view_controller = [[UIViewController alloc] init];
   ScopedKeyWindow scoped_key_window_;
   [scoped_key_window_.Get() setRootViewController:base_view_controller];
 
   AddressEditCoordinator* coordinator = [[AddressEditCoordinator alloc]
@@ skipping 177 matching lines @@
   UINavigationController* navigation_controller =
       base::mac::ObjCCastStrict<UINavigationController>(
           base_view_controller.presentedViewController);
   PaymentRequestEditViewController* view_controller =
       base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
           navigation_controller.visibleViewController);
   [coordinator paymentRequestEditViewControllerDidCancel:view_controller];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }