Set UserPopulation in RealTime Url Service.

Bug: 1017499
Fixes: 1017499
Change-Id: I0b4f6da09b8cb5804fe85e7402f3e1ea83193497
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088502Reviewed-by: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Xinghui Lu <xinghuilu@chromium.org>
Commit-Queue: Bettina Dea <bdea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747472}

components/safe_browsing/core/realtime/BUILD.gn

@@ -15,6 +15,7 @@ static_library("url_lookup_service") {
     "//components/safe_browsing/core:realtimeapi_proto",
     "//components/safe_browsing/core:verdict_cache_manager",
     "//components/safe_browsing/core/browser:token_fetcher",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/safe_browsing/core/common:thread_utils",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
     "//components/signin/public/identity_manager",

components/safe_browsing/core/realtime/url_lookup_service.cc

@@ -13,6 +13,7 @@
 #include "base/time/time.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing/core/browser/safe_browsing_token_fetcher.h"
+#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/safe_browsing/core/common/thread_utils.h"
 #include "components/safe_browsing/core/db/v4_protocol_manager_util.h"
 #include "components/safe_browsing/core/realtime/policy_engine.h"
@@ -315,7 +316,14 @@ std::unique_ptr<RTLookupRequest> RealTimeUrlLookupService::FillRequestProto(
   auto request = std::make_unique<RTLookupRequest>();
   request->set_url(SanitizeURL(url).spec());
   request->set_lookup_type(RTLookupRequest::NAVIGATION);
-  // TODO(crbug.com/1017499): Set ChromeUserPopulation.
+
+  ChromeUserPopulation* user_population = request->mutable_population();
+  user_population->set_user_population(
+      IsEnhancedProtectionEnabled(*pref_service_)
+          ? ChromeUserPopulation::ENHANCED_PROTECTION
+          : IsExtendedReportingEnabled(*pref_service_)
+                ? ChromeUserPopulation::EXTENDED_REPORTING
+                : ChromeUserPopulation::SAFE_BROWSING);
   return request;
 }
 

components/safe_browsing/core/realtime/url_lookup_service_unittest.cc

@@ -22,6 +22,7 @@ class RealTimeUrlLookupServiceTest : public PlatformTest {
  public:
   void SetUp() override {
     HostContentSettingsMap::RegisterProfilePrefs(test_pref_service_.registry());
+    safe_browsing::RegisterProfilePrefs(test_pref_service_.registry());
     task_environment_ = CreateTestTaskEnvironment(
         base::test::TaskEnvironment::TimeSource::MOCK_TIME);
     PlatformTest::SetUp();
@@ -104,6 +105,8 @@ TEST_F(RealTimeUrlLookupServiceTest, TestFillRequestProto) {
     auto result = FillRequestProto(url);
     EXPECT_EQ(sanitize_url_cases[i].expected_url, result->url());
     EXPECT_EQ(RTLookupRequest::NAVIGATION, result->lookup_type());
+    EXPECT_EQ(ChromeUserPopulation::SAFE_BROWSING,
+              result->population().user_population());
   }
 }