Use shared UKM source id for JourneyLogger.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I33d2163e45e439d1ce109f17afeded9c11171381
Reviewed-on: https://chromium-review.googlesource.com/1136004Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Commit-Queue: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575485}

chrome/android/java/src/org/chromium/chrome/browser/payments/JourneyLogger.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.payments;
 
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.content_public.browser.WebContents;
 
 /**
  * A class used to record journey metrics for the Payment Request feature.
@@ -19,10 +20,10 @@ public class JourneyLogger {
     private boolean mWasPaymentRequestTriggered;
     private boolean mHasRecorded;
 
-    public JourneyLogger(boolean isIncognito, String url) {
+    public JourneyLogger(boolean isIncognito, WebContents webContents) {
         // Note that this pointer could leak the native object. The called must call destroy() to
         // ensure that the native object is destroyed.
-        mJourneyLoggerAndroid = nativeInitJourneyLoggerAndroid(isIncognito, url);
+        mJourneyLoggerAndroid = nativeInitJourneyLoggerAndroid(isIncognito, webContents);
     }
 
     /** Will destroy the native object. This class shouldn't be used afterwards. */
@@ -176,7 +177,8 @@ public class JourneyLogger {
         }
     }
 
-    private native long nativeInitJourneyLoggerAndroid(boolean isIncognito, String url);
+    private native long nativeInitJourneyLoggerAndroid(
+            boolean isIncognito, WebContents webContents);
     private native void nativeDestroy(long nativeJourneyLoggerAndroid);
     private native void nativeSetNumberOfSuggestionsShown(long nativeJourneyLoggerAndroid,
             int section, int number, boolean hasCompleteSuggestion);

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -404,7 +404,7 @@ public class PaymentRequestImpl
                 new AddressEditor(/*emailFieldIncluded=*/false, /*saveToDisk=*/!mIsIncognito);
         mCardEditor = new CardEditor(mWebContents, mAddressEditor, sObserverForTest);
 
-        mJourneyLogger = new JourneyLogger(mIsIncognito, mWebContents.getLastCommittedUrl());
+        mJourneyLogger = new JourneyLogger(mIsIncognito, mWebContents);
 
         if (sCanMakePaymentQueries == null) sCanMakePaymentQueries = new ArrayMap<>();
 

chrome/browser/payments/android/journey_logger_android.cc

@@ -5,9 +5,9 @@
 #include "chrome/browser/payments/android/journey_logger_android.h"
 
 #include "base/android/jni_string.h"
+#include "components/ukm/content/source_url_recorder.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/JourneyLogger_jni.h"
-#include "services/metrics/public/cpp/ukm_recorder.h"
-#include "url/gurl.h"
 
 namespace payments {
 namespace {
@@ -18,8 +18,8 @@ using ::base::android::ConvertJavaStringToUTF8;
 }  // namespace
 
 JourneyLoggerAndroid::JourneyLoggerAndroid(bool is_incognito,
-                                           const std::string& url)
-    : journey_logger_(is_incognito, GURL(url), ukm::UkmRecorder::Get()) {}
+                                           ukm::SourceId source_id)
+    : journey_logger_(is_incognito, source_id) {}
 
 JourneyLoggerAndroid::~JourneyLoggerAndroid() {}
 
@@ -137,9 +137,11 @@ static jlong JNI_JourneyLogger_InitJourneyLoggerAndroid(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller,
     jboolean jis_incognito,
-    const base::android::JavaParamRef<jstring>& jurl) {
+    const JavaParamRef<jobject>& jweb_contents) {
+  content::WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(jweb_contents);
   return reinterpret_cast<jlong>(new JourneyLoggerAndroid(
-      jis_incognito, ConvertJavaStringToUTF8(env, jurl)));
+      jis_incognito, ukm::GetSourceIdForWebContentsDocument(web_contents)));
 }
 
 }  // namespace payments

chrome/browser/payments/android/journey_logger_android.h

@@ -8,13 +8,14 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "components/payments/core/journey_logger.h"
+#include "services/metrics/public/cpp/ukm_source_id.h"
 
 namespace payments {
 
 // Forwarding calls to payments::JourneyLogger.
 class JourneyLoggerAndroid {
  public:
-  JourneyLoggerAndroid(bool is_incognito, const std::string& url);
+  JourneyLoggerAndroid(bool is_incognito, ukm::SourceId source_id);
   ~JourneyLoggerAndroid();
 
   // Message from Java to destroy this object.

components/payments/content/BUILD.gn

@@ -36,6 +36,7 @@ static_library("content") {
     "//components/payments/mojom",
     "//components/prefs",
     "//components/strings:components_strings_grit",
+    "//components/ukm/content",
     "//components/url_formatter",
     "//content/public/browser",
     "//third_party/blink/public:blink_headers",
@@ -119,6 +120,7 @@ source_set("unit_tests") {
     "//components/strings:components_strings_grit",
     "//components/webdata/common",
     "//content/test:test_support",
+    "//services/metrics/public/cpp:metrics_cpp",
     "//sql",
     "//testing/gtest",
     "//third_party/blink/public:blink_headers",

components/payments/content/DEPS

@@ -5,12 +5,14 @@ include_rules = [
   "+components/keyed_service/core",
   "+components/prefs",
   "+components/strings",
+  "+components/ukm/content",
   "+components/url_formatter",
   "+components/webdata/common",
   "+content/public",
   "+mojo/public/cpp",
   "+net",
   "+services/data_decoder/public/cpp",
+  "+services/metrics/public/cpp",
   "+sql",
   "+third_party/blink/public/common",
   "+third_party/blink/public/platform/modules/payments",

components/payments/content/payment_request.cc

@@ -21,6 +21,7 @@
 #include "components/payments/core/payment_instrument.h"
 #include "components/payments/core/payment_prefs.h"
 #include "components/prefs/pref_service.h"
+#include "components/ukm/content/source_url_recorder.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ -49,8 +50,7 @@ PaymentRequest::PaymentRequest(
           render_frame_host->GetLastCommittedURL())),
       observer_for_testing_(observer_for_testing),
       journey_logger_(delegate_->IsIncognito(),
-                      web_contents_->GetLastCommittedURL(),
-                      delegate_->GetUkmRecorder()),
+                      ukm::GetSourceIdForWebContentsDocument(web_contents)),
       weak_ptr_factory_(this) {
   // OnConnectionTerminated will be called when the Mojo pipe is closed. This
   // will happen as a result of many renderer-side events (both successful and

components/payments/content/payment_request_state_unittest.cc

@@ -16,6 +16,7 @@
 #include "components/payments/content/payment_request_spec.h"
 #include "components/payments/content/test_content_payment_request_delegate.h"
 #include "components/payments/core/journey_logger.h"
+#include "services/metrics/public/cpp/ukm_recorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/platform/modules/payments/payment_request.mojom.h"
 
@@ -29,8 +30,7 @@ class PaymentRequestStateTest : public testing::Test,
       : num_on_selected_information_changed_called_(0),
         test_payment_request_delegate_(&test_personal_data_manager_),
         journey_logger_(test_payment_request_delegate_.IsIncognito(),
-                        GURL("http://www.test.com"),
-                        test_payment_request_delegate_.GetUkmRecorder()),
+                        ukm::UkmRecorder::GetNewSourceID()),
         address_(autofill::test::GetFullProfile()),
         credit_card_visa_(autofill::test::GetCreditCard()) {
     test_personal_data_manager_.SetAutofillCreditCardEnabled(true);

components/payments/core/journey_logger.cc

@@ -55,13 +55,10 @@ std::string GetHistogramNameSuffix(
 
 }  // namespace
 
-JourneyLogger::JourneyLogger(bool is_incognito,
-                             const GURL& url,
-                             ukm::UkmRecorder* ukm_recorder)
+JourneyLogger::JourneyLogger(bool is_incognito, ukm::SourceId source_id)
     : is_incognito_(is_incognito),
       events_(EVENT_INITIATED),
-      url_(url),
-      ukm_recorder_(ukm_recorder) {}
+      source_id_(source_id) {}
 
 JourneyLogger::~JourneyLogger() {
   if (WasPaymentRequestTriggered())
@@ -241,16 +238,14 @@ void JourneyLogger::RecordEventsMetric(CompletionStatus completion_status) {
   // Record the events in UMA.
   base::UmaHistogramSparse("PaymentRequest.Events", events_);
 
-  if (!ukm_recorder_ || !url_.is_valid())
+  if (source_id_ == ukm::kInvalidSourceId)
     return;
 
   // Record the events in UKM.
-  ukm::SourceId source_id = ukm_recorder_->GetNewSourceID();
-  ukm_recorder_->UpdateSourceURL(source_id, url_);
-  ukm::builders::PaymentRequest_CheckoutEvents(source_id)
+  ukm::builders::PaymentRequest_CheckoutEvents(source_id_)
       .SetCompletionStatus(completion_status)
       .SetEvents(events_)
-      .Record(ukm_recorder_);
+      .Record(ukm::UkmRecorder::Get());
 }
 
 bool JourneyLogger::WasPaymentRequestTriggered() {

components/payments/core/journey_logger.h

@@ -8,11 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "url/gurl.h"
-
-namespace ukm {
-class UkmRecorder;
-}
+#include "services/metrics/public/cpp/ukm_source_id.h"
 
 namespace payments {
 
@@ -127,9 +123,7 @@ class JourneyLogger {
     NOT_SHOWN_REASON_MAX = 4,
   };
 
-  JourneyLogger(bool is_incognito,
-                const GURL& url,
-                ukm::UkmRecorder* ukm_recorder);
+  JourneyLogger(bool is_incognito, ukm::SourceId source_id);
   ~JourneyLogger();
 
   // Increments the number of selection adds for the specified section.
@@ -232,10 +226,7 @@ class JourneyLogger {
   // Accumulates the many events that have happened during the Payment Request.
   int events_;
 
-  const GURL url_;
-
-  // Not owned, will outlive this object.
-  ukm::UkmRecorder* ukm_recorder_;
+  ukm::SourceId source_id_;
 
   DISALLOW_COPY_AND_ASSIGN(JourneyLogger);
 };

ios/chrome/browser/payments/BUILD.gn

@@ -44,6 +44,7 @@ source_set("payments") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/autofill",
     "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/metrics",
     "//ios/chrome/browser/signin",
     "//ios/web",
     "//net",

ios/chrome/browser/payments/payment_request.mm

@@ -31,6 +31,7 @@
 #include "ios/chrome/browser/autofill/address_normalizer_factory.h"
 #include "ios/chrome/browser/autofill/validation_rules_storage_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+#import "ios/chrome/browser/metrics/ukm_url_recorder.h"
 #import "ios/chrome/browser/payments/ios_payment_instrument.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
@@ -96,7 +97,8 @@ PaymentRequest::PaymentRequest(
       selected_payment_method_(nullptr),
       selected_shipping_option_(nullptr),
       profile_comparator_(GetApplicationLocale(), *this),
-      journey_logger_(IsIncognito(), GetLastCommittedURL(), GetUkmRecorder()),
+      journey_logger_(IsIncognito(),
+                      ukm::GetSourceIdForWebStateDocument(web_state)),
       payment_instruments_ready_(false),
       ios_instrument_finder_(
           GetApplicationContext()->GetSharedURLLoaderFactory(),