Switch to using scoped_ptr with UserData

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc

 // Copyright 2017 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/browsing_data/chrome_browsing_data_remover_delegate.h"
 
 #include "base/guid.h"
+#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
@@ skipping 705 matching lines @@
 
 base::Time AnHourAgo() {
   return base::Time::Now() - base::TimeDelta::FromHours(1);
 }
 
 class RemoveDownloadsTester {
  public:
   explicit RemoveDownloadsTester(TestingProfile* testing_profile)
       : download_manager_(new content::MockDownloadManager()),
         chrome_download_manager_delegate_(testing_profile) {
-    content::BrowserContext::SetDownloadManagerForTesting(testing_profile,
-                                                          download_manager_);
+    content::BrowserContext::SetDownloadManagerForTesting(
+        testing_profile, base::WrapUnique(download_manager_));
     EXPECT_EQ(download_manager_,
               content::BrowserContext::GetDownloadManager(testing_profile));
 
     EXPECT_CALL(*download_manager_, GetDelegate())
         .WillOnce(Return(&chrome_download_manager_delegate_));
     EXPECT_CALL(*download_manager_, Shutdown());
   }
 
   ~RemoveDownloadsTester() { chrome_download_manager_delegate_.Shutdown(); }
 
   content::MockDownloadManager* download_manager() { return download_manager_; }
 
  private:
-  content::MockDownloadManager* download_manager_;
+  content::MockDownloadManager* download_manager_;  // owned by testing profile

[Nico, 2017/04/14 18:53:20]

ditto

[Avi (use Gerrit), 2017/04/14 18:59:38]

Done.

   ChromeDownloadManagerDelegate chrome_download_manager_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveDownloadsTester);
 };
 
 }  // namespace
 
 // RemoveAutofillTester is not a part of the anonymous namespace above, as
 // PersonalDataManager declares it a friend in an empty namespace.
 class RemoveAutofillTester : public autofill::PersonalDataManagerObserver {
@@ skipping 1229 matching lines @@
   EXPECT_FALSE(Match(kOrigin1, kProtected, nullptr));
   EXPECT_FALSE(Match(kOriginExt, kProtected, nullptr));
   EXPECT_FALSE(Match(kOriginDevTools, kProtected, nullptr));
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   EXPECT_FALSE(Match(kOrigin1, kExtension, nullptr));
   EXPECT_TRUE(Match(kOriginExt, kExtension, nullptr));
   EXPECT_FALSE(Match(kOriginDevTools, kExtension, nullptr));
 #endif
 }