Minor: Have a method return store_file_name_map instead of a global

components/safe_browsing_db/v4_local_database_manager.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.
 
 // This file should not be build on Android but is currently getting built.
 // TODO(vakh): Fix that: http://crbug.com/621647
 
 #include "components/safe_browsing_db/v4_local_database_manager.h"
 
 #include <vector>
@@ skipping 15 matching lines @@
 #define PLATFORM_TYPE OSX_PLATFORM
 #else
 // This should ideally never compile but it is getting compiled on Android.
 // See: https://bugs.chromium.org/p/chromium/issues/detail?id=621647
 // TODO(vakh): Once that bug is fixed, this should be removed. If we leave
 // the platform_type empty, the server won't recognize the request and
 // return an error response which will pollute our UMA metrics.
 #define PLATFORM_TYPE LINUX_PLATFORM
 #endif
 
 // TODO(vakh): Implement this to populate the map appopriately.

[Scott Hess - ex-Googler, 2016/06/29 03:25:50]

"appropriately", while you're here...

 // Filed as http://crbug.com/608075
-StoreFileNameMap store_file_name_map{
-    {UpdateListIdentifier(PLATFORM_TYPE, URL, MALWARE_THREAT),
-     "UrlMalware.store"},
-    {UpdateListIdentifier(PLATFORM_TYPE, URL, SOCIAL_ENGINEERING_PUBLIC),
-     "UrlSoceng.store"}};
+StoreFileNameMap GetStoreFileNameMap() {
+  return StoreFileNameMap(
+      {{UpdateListIdentifier(PLATFORM_TYPE, URL, MALWARE_THREAT),
+        "UrlMalware.store"},
+       {UpdateListIdentifier(PLATFORM_TYPE, URL, SOCIAL_ENGINEERING_PUBLIC),
+        "UrlSoceng.store"}});
+}
 
 }  // namespace
 
 V4LocalDatabaseManager::V4LocalDatabaseManager(const base::FilePath& base_path)
     : base_path_(base_path), enabled_(false) {
   DCHECK(!base_path_.empty());
   DVLOG(1) << "V4LocalDatabaseManager::V4LocalDatabaseManager: "
            << "base_path_: " << base_path_.AsUTF8Unsafe();
 }
 
@@ skipping 146 matching lines @@
   // previously been started and stopped, a task runner could already exist.
   if (!task_runner_) {
     base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
     task_runner_ = pool->GetSequencedTaskRunnerWithShutdownBehavior(
         pool->GetSequenceToken(), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
   }
 
   // Do not create the database on the IO thread since this may be an expensive
   // operation. Instead, do that on the task_runner and when the new database
   // has been created, swap it out on the IO thread.
+  StoreFileNameMap store_file_name_map = GetStoreFileNameMap();
   DCHECK(!store_file_name_map.empty());
   NewDatabaseReadyCallback db_ready_callback = base::Bind(
       &V4LocalDatabaseManager::DatabaseReady, base::Unretained(this));
   V4Database::Create(task_runner_, base_path_, store_file_name_map,
                      db_ready_callback);
 }
 
 void V4LocalDatabaseManager::DatabaseReady(
     std::unique_ptr<V4Database> v4_database) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 36 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   v4_database_->ApplyUpdate(responses, db_updated_callback_);
 }
 
 void V4LocalDatabaseManager::DatabaseUpdated() {
   v4_update_protocol_manager_->ScheduleNextUpdate(
       v4_database_->GetStoreStateMap());
 }
 
 }  // namespace safe_browsing