Make DownloadItem derive SupportsUserData instead of re-implementing it.

content/browser/download/download_item_impl_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/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "content/browser/download/byte_stream.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
@@ skipping 390 matching lines @@
                                    content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
                                    intermediate_path);
   RunAllPendingInMessageLoops();
   EXPECT_EQ(FILE_PATH_LITERAL("foo.bar"),
             item->GetFileNameToReportUser().value());
   item->SetDisplayName(FilePath(FILE_PATH_LITERAL("new.name")));
   EXPECT_EQ(FILE_PATH_LITERAL("new.name"),
             item->GetFileNameToReportUser().value());
 }
 
-static char external_data_test_string[] = "External data test";
-static int destructor_called = 0;
-
-class TestExternalData : public DownloadItem::ExternalData {
- public:
-  int value;
-  virtual ~TestExternalData() {
-    destructor_called++;
-  }
-};
-
-TEST_F(DownloadItemTest, ExternalData) {
-  DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
-  const DownloadItemImpl* const_item = item;
-
-  // Shouldn't be anything there before set.
-  EXPECT_EQ(NULL, item->GetExternalData(&external_data_test_string));
-  EXPECT_EQ(NULL, const_item->GetExternalData(&external_data_test_string));
-
-  TestExternalData* test1(new TestExternalData());
-  test1->value = 2;
-
-  // Should be able to get back what you set.
-  item->SetExternalData(&external_data_test_string, test1);
-  TestExternalData* test_result =
-      static_cast<TestExternalData*>(
-          item->GetExternalData(&external_data_test_string));
-  EXPECT_EQ(test1, test_result);
-
-  // Ditto for const lookup.
-  const TestExternalData* test_const_result =
-      static_cast<const TestExternalData*>(
-          const_item->GetExternalData(&external_data_test_string));
-  EXPECT_EQ(static_cast<const TestExternalData*>(test1),
-            test_const_result);
-
-  // Destructor should be called if value overwritten.  New value
-  // should then be retrievable.
-  TestExternalData* test2(new TestExternalData());
-  test2->value = 3;
-  EXPECT_EQ(0, destructor_called);
-  item->SetExternalData(&external_data_test_string, test2);
-  EXPECT_EQ(1, destructor_called);
-  EXPECT_EQ(static_cast<DownloadItem::ExternalData*>(test2),
-            item->GetExternalData(&external_data_test_string));
-
-  // Overwriting with the same value shouldn't do anything.
-  EXPECT_EQ(1, destructor_called);
-  item->SetExternalData(&external_data_test_string, test2);
-  EXPECT_EQ(1, destructor_called);
-  EXPECT_EQ(static_cast<DownloadItem::ExternalData*>(test2),
-            item->GetExternalData(&external_data_test_string));
-
-  // Overwriting with NULL should result in destruction.
-  item->SetExternalData(&external_data_test_string, NULL);
-  EXPECT_EQ(2, destructor_called);
-
-  // Destroying the download item should destroy the external data.
-
-  TestExternalData* test3(new TestExternalData());
-  item->SetExternalData(&external_data_test_string, test3);
-  EXPECT_EQ(static_cast<DownloadItem::ExternalData*>(test3),
-            item->GetExternalData(&external_data_test_string));
-  DestroyDownloadItem(item);
-  EXPECT_EQ(3, destructor_called);
-}
-
 // Test that the delegate is invoked after the download file is renamed.
 // Delegate::DownloadRenamedToIntermediateName() should be invoked when the
 // download is renamed to the intermediate name.
 // Delegate::DownloadRenamedToFinalName() should be invoked after the final
 // rename.
 TEST_F(DownloadItemTest, CallbackAfterRename) {
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   FilePath final_path(FilePath(kDummyPath).AppendASCII("foo.bar"));
   FilePath intermediate_path(final_path.InsertBeforeExtensionASCII("x"));
   FilePath new_intermediate_path(final_path.InsertBeforeExtensionASCII("y"));
@@ skipping 75 matching lines @@
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
 
   EXPECT_FALSE(item->GetFileExternallyRemoved());
   item->OnDownloadedFileRemoved();
   EXPECT_TRUE(item->GetFileExternallyRemoved());
 }
 
 TEST(MockDownloadItem, Compiles) {
   MockDownloadItem mock_item;
 }