Make GlobalErrorService's ownership model slightly less insane.

chrome/browser/safe_browsing/srt_fetcher_win.cc

 // Copyright 2015 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/srt_fetcher_win.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
@@ skipping 489 matching lines @@
     if (!browser)
       browser = new Browser(Browser::CreateParams(profile));
   }
   GlobalErrorService* global_error_service =
       GlobalErrorServiceFactory::GetForProfile(profile);
   SRTGlobalError* global_error =
       new SRTGlobalError(global_error_service, download_path);
 
   // Ownership of |global_error| is passed to the service. The error removes
   // itself from the service and self-destructs when done.
-  global_error_service->AddGlobalError(global_error);
+  global_error_service->AddOwnedGlobalError(base::WrapUnique(global_error));
 
   bool show_bubble = true;
   PrefService* local_state = g_browser_process->local_state();
   if (local_state && local_state->GetBoolean(prefs::kSwReporterPendingPrompt)) {
     // Don't show the bubble if there's already a pending prompt to only be
     // sown in the Chrome menu.
     RecordReporterStepHistogram(SW_REPORTER_ADDED_TO_MENU);
     show_bubble = false;
   } else {
     // Do not try to show bubble if another GlobalError is already showing
@@ skipping 535 matching lines @@
   return srt_cleaner_key.Open(HKEY_CURRENT_USER, cleaner_key_path.c_str(),
                               KEY_QUERY_VALUE) == ERROR_SUCCESS &&
          srt_cleaner_key.GetValueCount() > 0;
 }
 
 void SetSwReporterTestingDelegate(SwReporterTestingDelegate* delegate) {
   g_testing_delegate_ = delegate;
 }
 
 }  // namespace safe_browsing