Don't set DM token field in consumer requests.

Bug: 1114761
Change-Id: Id46125f5a1d28c4af39be7bbd75d08172c1a1490
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345715Reviewed-by: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Auto-Submit: Xinghui Lu <xinghuilu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796428}

chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc

@@ -77,7 +77,8 @@ policy::DMToken ChromeEnterpriseRealTimeUrlLookupService::GetDMToken() const {
   return ::safe_browsing::GetDMToken(profile_);
 }
 
-std::string ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const {
+base::Optional<std::string>
+ChromeEnterpriseRealTimeUrlLookupService::GetDMTokenString() const {
   DCHECK(GetDMToken().is_valid())
       << "Get a dm token string only if the dm token is valid.";
   return GetDMToken().value();

chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h

@@ -64,7 +64,7 @@ class ChromeEnterpriseRealTimeUrlLookupService
   void GetAccessToken(const GURL& url,
                       RTLookupRequestCallback request_callback,
                       RTLookupResponseCallback response_callback) override;
-  std::string GetDMTokenString() const override;
+  base::Optional<std::string> GetDMTokenString() const override;
   std::string GetMetricSuffix() const override;
 
   policy::DMToken GetDMToken() const;

components/safe_browsing/core/realtime/url_lookup_service.cc

@@ -145,9 +145,9 @@ RealTimeUrlLookupService::GetTrafficAnnotationTag() const {
         })");
 }
 
-std::string RealTimeUrlLookupService::GetDMTokenString() const {
+base::Optional<std::string> RealTimeUrlLookupService::GetDMTokenString() const {
   // DM token should only be set for enterprise requests.
-  return "";
+  return base::nullopt;
 }
 
 std::string RealTimeUrlLookupService::GetMetricSuffix() const {

components/safe_browsing/core/realtime/url_lookup_service.h

@@ -79,7 +79,7 @@ class RealTimeUrlLookupService : public RealTimeUrlLookupServiceBase {
   void GetAccessToken(const GURL& url,
                       RTLookupRequestCallback request_callback,
                       RTLookupResponseCallback response_callback) override;
-  std::string GetDMTokenString() const override;
+  base::Optional<std::string> GetDMTokenString() const override;
   std::string GetMetricSuffix() const override;
 
   // Called when the access token is obtained from |token_fetcher_|.

components/safe_browsing/core/realtime/url_lookup_service_base.cc

@@ -413,7 +413,10 @@ std::unique_ptr<RTLookupRequest> RealTimeUrlLookupServiceBase::FillRequestProto(
   auto request = std::make_unique<RTLookupRequest>();
   request->set_url(SanitizeURL(url).spec());
   request->set_lookup_type(RTLookupRequest::NAVIGATION);
-  request->set_dm_token(GetDMTokenString());
+  base::Optional<std::string> dm_token_string = GetDMTokenString();
+  if (dm_token_string.has_value()) {
+    request->set_dm_token(dm_token_string.value());
+  }
 
   ChromeUserPopulation* user_population = request->mutable_population();
   user_population->set_user_population(

components/safe_browsing/core/realtime/url_lookup_service_base.h

@@ -137,7 +137,7 @@ class RealTimeUrlLookupServiceBase : public KeyedService {
                               RTLookupResponseCallback response_callback) = 0;
 
   // Gets a dm token string to be set in a request proto.
-  virtual std::string GetDMTokenString() const = 0;
+  virtual base::Optional<std::string> GetDMTokenString() const = 0;
 
   // Suffix for logging metrics.
   virtual std::string GetMetricSuffix() const = 0;

components/safe_browsing/core/realtime/url_lookup_service_unittest.cc

@@ -602,6 +602,7 @@ TEST_F(RealTimeUrlLookupServiceTest,
       url,
       base::BindOnce(
           [](std::unique_ptr<RTLookupRequest> request, std::string token) {
+            EXPECT_FALSE(request->has_dm_token());
             // Check token is attached.
             EXPECT_EQ("access_token_string", token);
           }),