Add extended reporting level in the update request

chrome/browser/safe_browsing/services_delegate_impl.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/safe_browsing/services_delegate_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 36 matching lines @@
     net::URLRequestContextGetter* context_getter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 #if defined(SAFE_BROWSING_CSD)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
     csd_service_.reset(ClientSideDetectionService::Create(context_getter));
   }
 #endif  // defined(SAFE_BROWSING_CSD)
 }
 
+ExtendedReportingLevel ServicesDelegateImpl::GetMayBeExtendedReportingLevel()
+    const {
+  if (safe_browsing_service_->maybe_enabled_extended_reporting_by_prefs()) {

[Jialiu Lin, 2017/01/25 02:03:29]

nit: It is possible that both maybe_enabled_extended_reporting_by_prefs() and
maybe_enabled_scout_reporting_by_prefs() are true (a.k.a some profiles are in
scout, some profiles are in legacy SBER). Maybe we should document either here
or in the .h file that in case of a tie, we fall back to SBER. 

[vakh (use Gerrit instead), 2017/01/25 02:13:41]

Done.

+    // If extended reporting is enabled, report that so that we can track its
+    // usage better for deprecation.
+    return SBER_LEVEL_LEGACY;
+  }
+  if (safe_browsing_service_->maybe_enabled_scout_reporting_by_prefs()) {
+    return SBER_LEVEL_SCOUT;
+  }
+  return SBER_LEVEL_OFF;
+}
+
 const scoped_refptr<SafeBrowsingDatabaseManager>&
 ServicesDelegateImpl::v4_local_database_manager() const {
   return v4_local_database_manager_;
 }
 
 void ServicesDelegateImpl::Initialize() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  v4_local_database_manager_ =
-      V4LocalDatabaseManager::Create(SafeBrowsingService::GetBaseFilename());
+  v4_local_database_manager_ = V4LocalDatabaseManager::Create(
+      SafeBrowsingService::GetBaseFilename(),
+      base::Bind(&ServicesDelegateImpl::GetMayBeExtendedReportingLevel,
+                 base::Unretained(this)));
 
   download_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateDownloadProtectionService())
           ? services_creator_->CreateDownloadProtectionService()
           : CreateDownloadProtectionService());
   incident_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateIncidentReportingService())
           ? services_creator_->CreateIncidentReportingService()
@@ skipping 93 matching lines @@
   }
 }
 
 void ServicesDelegateImpl::StopOnIOThread(bool shutdown) {
   if (v4_local_database_manager_.get()) {
     v4_local_database_manager_->StopOnIOThread(shutdown);
   }
 }
 
 }  // namespace safe_browsing