Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/chrome/browser/history/thumbnail_database_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 <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_unittest_base.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "url/gurl.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace history {
 
@@ skipping 39 matching lines @@
 
   scoped_ptr<SkBitmap> google_bitmap_;
 
   base::ScopedTempDir temp_dir_;
   base::FilePath file_name_;
   base::FilePath new_file_name_;
   base::FilePath history_db_name_;
 };
 
 class IconMappingMigrationTest : public HistoryUnitTestBase {
+ public:
+  IconMappingMigrationTest() {
+  }
+  virtual ~IconMappingMigrationTest() {
+  }
+
  protected:
   virtual void SetUp() {
+    profile_.reset(new TestingProfile);
+
     base::FilePath data_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     data_path = data_path.AppendASCII("History");
 
-    history_db_name_ = profile_.GetPath().Append(chrome::kHistoryFilename);
+    history_db_name_ = profile_->GetPath().Append(chrome::kHistoryFilename);
     ASSERT_NO_FATAL_FAILURE(
         ExecuteSQLScript(data_path.AppendASCII("history.20.sql"),
                          history_db_name_));
     thumbnail_db_name_ =
-        profile_.GetPath().Append(chrome::kFaviconsFilename);
+        profile_->GetPath().Append(chrome::kFaviconsFilename);
     ASSERT_NO_FATAL_FAILURE(
         ExecuteSQLScript(data_path.AppendASCII("thumbnails.3.sql"),
                          thumbnail_db_name_));
   }
 
  protected:
   base::FilePath history_db_name_;
   base::FilePath thumbnail_db_name_;
 
  private:
-  content::TestBrowserThreadBundle thread_bundle_;
-  TestingProfile profile_;
+  scoped_ptr<TestingProfile> profile_;
 };
 
 TEST_F(ThumbnailDatabaseTest, AddIconMapping) {
   ThumbnailDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_, NULL, NULL));
   db.BeginTransaction();
 
   std::vector<unsigned char> data(blob1, blob1 + sizeof(blob1));
   scoped_refptr<base::RefCountedBytes> favicon(new base::RefCountedBytes(data));
 
@@ skipping 730 matching lines @@
   EXPECT_EQ(touch_mapping_id1, icon_mapping.mapping_id);
   EXPECT_EQ(url, icon_mapping.page_url);
   EXPECT_EQ(touch_icon_id1, icon_mapping.icon_id);
   EXPECT_EQ(icon_url1, icon_mapping.icon_url);
   EXPECT_EQ(chrome::TOUCH_ICON, icon_mapping.icon_type);
 
   EXPECT_FALSE(enumerator2.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history