Switch to using scoped_ptr with UserData

chrome/browser/browsing_data/browsing_data_remover_impl_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 <stddef.h>
 #include <stdint.h>
 
 #include <list>
 #include <memory>
 #include <set>
@@ skipping 497 matching lines @@
   std::vector<content::LocalStorageUsageInfo> infos_;
   base::Closure quit_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveLocalStorageTester);
 };
 
 class RemoveDownloadsTester {
  public:
   explicit RemoveDownloadsTester(BrowserContext* browser_context)
       : download_manager_(new content::MockDownloadManager()) {
-    content::BrowserContext::SetDownloadManagerForTesting(browser_context,
-                                                          download_manager_);
+    content::BrowserContext::SetDownloadManagerForTesting(
+        browser_context, base::WrapUnique(download_manager_));

[Nico, 2017/04/14 15:46:58]

That looks really surprising, having a member owned by a thing that gets passed
in. At least add a comment to the member variable explaining this; ideally
reshuffle things to make ownership less weird.

[Avi (use Gerrit), 2017/04/14 18:17:50]

Done.

     EXPECT_EQ(download_manager_,
               content::BrowserContext::GetDownloadManager(browser_context));
     EXPECT_CALL(*download_manager_, Shutdown());
   }
 
   ~RemoveDownloadsTester() {}
 
   content::MockDownloadManager* download_manager() { return download_manager_; }
 
  private:
@@ skipping 1177 matching lines @@
 
   EXPECT_TRUE(remover->is_removing());
 
   // Add one more deletion and wait for it.
   BlockUntilBrowsingDataRemoved(
       base::Time(), base::Time::Max(), BrowsingDataRemover::DATA_TYPE_COOKIES,
       BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB);
 
   EXPECT_FALSE(remover->is_removing());
 }