BrowserContext should simply own DownloadManager

chrome/browser/download/download_shelf_unittest.cc

 // Copyright (c) 2012 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 "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/test_download_shelf.h"
@@ skipping 13 matching lines @@
 
 class DownloadShelfTest : public testing::Test {
  public:
   DownloadShelfTest();
 
  protected:
   content::MockDownloadItem* download_item() {
     return download_item_.get();
   }
   content::MockDownloadManager* download_manager() {
-    return download_manager_.get();
+    return download_manager_;
   }
   TestDownloadShelf* shelf() {
     return &shelf_;
   }
 
  private:
   scoped_ptr<content::MockDownloadItem> GetInProgressMockDownload();
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   scoped_ptr<content::MockDownloadItem> download_item_;
-  scoped_refptr<content::MockDownloadManager> download_manager_;
+  content::MockDownloadManager* download_manager_;

[benjhayden, 2013/05/17 14:50:03]

Should this be a scoped_ptr?

[cmarcelo, 2013/05/20 15:22:06]

Indeed, thanks.

   TestDownloadShelf shelf_;
 };
 
 DownloadShelfTest::DownloadShelfTest()
     : ui_thread_(content::BrowserThread::UI, &message_loop_) {
   download_item_.reset(new ::testing::NiceMock<content::MockDownloadItem>());
   ON_CALL(*download_item_, GetAutoOpened()).WillByDefault(Return(false));
   ON_CALL(*download_item_, GetMimeType()).WillByDefault(Return("text/plain"));
   ON_CALL(*download_item_, GetOpenWhenComplete()).WillByDefault(Return(false));
   ON_CALL(*download_item_, GetTargetDisposition())
       .WillByDefault(Return(DownloadItem::TARGET_DISPOSITION_OVERWRITE));
   ON_CALL(*download_item_, GetURL())
       .WillByDefault(ReturnRefOfCopy(GURL("http://example.com/foo")));
   ON_CALL(*download_item_, IsComplete()).WillByDefault(Return(false));
   ON_CALL(*download_item_, IsInProgress()).WillByDefault(Return(true));
   ON_CALL(*download_item_, IsTemporary()).WillByDefault(Return(false));
   ON_CALL(*download_item_, ShouldOpenFileBasedOnExtension())
       .WillByDefault(Return(false));
 
   download_manager_ = new ::testing::NiceMock<content::MockDownloadManager>();
   ON_CALL(*download_manager_, GetDownload(_))
       .WillByDefault(Return(download_item_.get()));
 
-  shelf_.set_download_manager(download_manager_.get());
+  shelf_.set_download_manager(download_manager_);
 }
 
 } // namespace
 
 TEST_F(DownloadShelfTest, ClosesShelfWhenHidden) {
   shelf()->Show();
   EXPECT_TRUE(shelf()->IsShowing());
   shelf()->Hide();
   EXPECT_FALSE(shelf()->IsShowing());
   shelf()->Unhide();
@@ skipping 95 matching lines @@
       .WillRepeatedly(Return(false));
   ASSERT_FALSE(DownloadItemModel(download_item())
                .ShouldRemoveFromShelfWhenComplete());
 
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   EXPECT_TRUE(shelf()->did_add_download());
   EXPECT_TRUE(shelf()->IsShowing());
 }