Enable V4LocalDatabaseManager based on Finch.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2012 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/safe_browsing_service.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/v4_get_hash_protocol_manager.h"
+#include "components/safe_browsing_db/v4_local_database_manager.h"
 #include "components/user_prefs/tracked/tracked_preference_validation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_request_info.h"
 #include "google_apis/google_api_keys.h"
 #include "net/cookies/cookie_store.h"
 #include "net/extras/sqlite/cookie_crypto_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 203 matching lines @@
 }
 
 void SafeBrowsingService::Initialize() {
   url_request_context_getter_ = new SafeBrowsingURLRequestContextGetter(
       g_browser_process->system_request_context());
 
   ui_manager_ = CreateUIManager();
 
   database_manager_ = CreateDatabaseManager();
 
+  if (IsV4LocalDatabaseManagerEnabled()) {
+    v4_local_database_manager_ = CreateV4LocalDatabaseManager();
+  }
+
   services_delegate_->InitializeCsdService(url_request_context_getter_.get());
   services_delegate_->InitializeServices();
 
   // Track the safe browsing preference of existing profiles.
   // The SafeBrowsingService will be started if any existing profile has the
   // preference enabled. It will also listen for updates to the preferences.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (profile_manager) {
     std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
     // TODO(felt): I believe this for-loop is dead code. Confirm this and
@@ skipping 115 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SafeBrowsingService::ProcessResourceRequest, this, info));
 #endif
 }
 
 SafeBrowsingUIManager* SafeBrowsingService::CreateUIManager() {
   return new SafeBrowsingUIManager(this);
 }
 
+
+V4LocalDatabaseManager* SafeBrowsingService::CreateV4LocalDatabaseManager() {

[Nathan Parker, 2016/04/28 17:33:21]

This should probably go in the services_delegate[_impl].  That way it won't be
built/linked-in on Android.

(CreateDatabaseManager should go there as well, but it's not there yet).

[vakh (use Gerrit instead), 2016/04/29 18:06:47]

Done.

+  return new V4LocalDatabaseManager();
+}
+
 SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
 #if defined(SAFE_BROWSING_DB_LOCAL)
   return new LocalSafeBrowsingDatabaseManager(this);
 #elif defined(SAFE_BROWSING_DB_REMOTE)
   return new RemoteSafeBrowsingDatabaseManager();
 #else
   return NULL;
 #endif
 }
 
@@ skipping 63 matching lines @@
 SafeBrowsingService::GetProtocolManagerDelegate() {
 #if defined(SAFE_BROWSING_DB_LOCAL)
   return static_cast<LocalSafeBrowsingDatabaseManager*>(
       database_manager_.get());
 #else
   NOTREACHED();
   return NULL;
 #endif
 }
 
+bool SafeBrowsingService::IsV4LocalDatabaseManagerEnabled() {
+  const std::string group_name = base::FieldTrialList::FindFullName(
+      "SafeBrowsingV4LocalDatabaseManagerEnabled");
+  return StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
+}
+
 void SafeBrowsingService::StartOnIOThread(
     net::URLRequestContextGetter* url_request_context_getter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (enabled_)
     return;
   enabled_ = true;
 
   SafeBrowsingProtocolConfig config = GetProtocolConfig();
   V4ProtocolConfig v4_config = GetV4ProtocolConfig();
 
 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
   DCHECK(database_manager_.get());
   database_manager_->StartOnIOThread(url_request_context_getter, v4_config);
 #endif
 
 #if defined(SAFE_BROWSING_DB_LOCAL)
   SafeBrowsingProtocolManagerDelegate* protocol_manager_delegate =
       GetProtocolManagerDelegate();
   if (protocol_manager_delegate) {
     protocol_manager_ = SafeBrowsingProtocolManager::Create(
         protocol_manager_delegate, url_request_context_getter, config);
     protocol_manager_->Initialize();
   }
 #endif
 
+  if (IsV4LocalDatabaseManagerEnabled()) {

[Nathan Parker, 2016/04/28 17:33:21]

Rather than checking the field trial again (it shouldn't have changed), you
could just check if the ptr is not null.

I guess this should go in a ServicesDelegate::StartOnIOThread, since if we
actually make this file not include the v4ldbmgr header, you won't be able to
call methods on it.

[vakh (use Gerrit instead), 2016/04/29 18:06:47]

Done.

+    DCHECK(v4_local_database_manager_.get());
+    v4_local_database_manager_->StartOnIOThread(url_request_context_getter,
+                                                v4_config);
+  }
+
   DCHECK(!ping_manager_);
   ping_manager_ = SafeBrowsingPingManager::Create(
       url_request_context_getter, config);
 }
 
 void SafeBrowsingService::StopOnIOThread(bool shutdown) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
   database_manager_->StopOnIOThread(shutdown);
@@ skipping 133 matching lines @@
     ping_manager()->ReportThreatDetails(report);
 }
 
 void SafeBrowsingService::ProcessResourceRequest(
     const ResourceRequestInfo& request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   services_delegate_->ProcessResourceRequest(&request);
 }
 
 }  // namespace safe_browsing