[Payment Request] Adds a JourneyLogger instance to the PaymentRequest

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

Index: ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm
diff --git a/ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm b/ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm
index 3e44150cde1002f4a0688501bbc8087ff257b0b0..39a97ff2052db6b50f8732b38c8e643ddacab01a 100644
--- a/ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/payments/address_edit_coordinator_unittest.mm
@@ -18,11 +18,13 @@
 #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"
@@ -53,8 +55,12 @@ class MockPaymentsProfileComparator
 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&));
@@ -107,9 +113,13 @@ class PaymentRequestAddressEditCoordinatorTest : public PlatformTest {
       : 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(),
@@ -126,11 +136,13 @@ class PaymentRequestAddressEditCoordinatorTest : public PlatformTest {
 
   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