Replace ScopedVector with vector<scoped_ptr> in BitmapFetcherService.

chrome/browser/bitmap_fetcher/bitmap_fetcher_service_unittest.cc

 // Copyright 2014 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/bitmap_fetcher/bitmap_fetcher_service.h"
 
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 24 matching lines @@
 };
 
 class TestService : public BitmapFetcherService {
  public:
   explicit TestService(content::BrowserContext* context)
       : BitmapFetcherService(context) {}
   ~TestService() override {}
 
   // Create a fetcher, but don't start downloading. That allows side-stepping
   // the decode step, which requires a utility process.
-  chrome::BitmapFetcher* CreateFetcher(const GURL& url) override {
-    return new chrome::BitmapFetcher(url, this);
+  scoped_ptr<chrome::BitmapFetcher> CreateFetcher(const GURL& url) override {
+    return make_scoped_ptr(new chrome::BitmapFetcher(url, this));
   }
 };
 
 }  // namespace
 
 class BitmapFetcherServiceTest : public testing::Test,
                                  public TestNotificationInterface {
  public:
   BitmapFetcherServiceTest()
       : url1_(GURL("http://example.org/sample-image-1.png")),
         url2_(GURL("http://example.org/sample-image-2.png")) {
   }
 
   void SetUp() override {
     service_.reset(new TestService(&profile_));
     requests_finished_ = 0;
     images_changed_ = 0;
   }
 
   const ScopedVector<BitmapFetcherRequest>& requests() const {
     return service_->requests_;
   }
   const ScopedVector<chrome::BitmapFetcher>& active_fetchers() const {
     return service_->active_fetchers_;

[Nico, 2015/11/11 01:28:23]

oh i guess this needs changing too?

[danakj, 2015/11/11 01:29:08]

ah yes thanks.

   }
   size_t cache_size() const { return service_->cache_.size(); }
 
   void OnImageChanged() override { images_changed_++; }
 
   void OnRequestFinished() override { requests_finished_++; }
 
   // Simulate finishing a URL fetch and decode for the given fetcher.
   void CompleteFetch(const GURL& url) {
     const chrome::BitmapFetcher* fetcher = service_->FindFetcherForUrl(url);
@@ skipping 107 matching lines @@
   service_->RequestImage(url1_, new TestObserver(this));
   service_->RequestImage(url2_, new TestObserver(this));
   EXPECT_EQ(0U, cache_size());
 
   CompleteFetch(url1_);
   EXPECT_EQ(1U, cache_size());
 
   FailFetch(url2_);
   EXPECT_EQ(1U, cache_size());
 }