Remove the Extensions URLRequestContext

chrome/browser/history/thumbnail_database_unittest.cc

Index: chrome/browser/history/thumbnail_database_unittest.cc
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index 6446fd15cfd6c0121746508d80503fd51ff96c4a..f8947fb9275e932c5bfdf72195c41a2582bb0d0a 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -19,6 +19,7 @@
 #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"
@@ -78,27 +79,19 @@ class ThumbnailDatabaseTest : public testing::Test {
 };
 
 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);
     // Set up history and thumbnails as they would be before migration.
     ASSERT_NO_FATAL_FAILURE(
         ExecuteSQLScript(data_path.AppendASCII("history.20.sql"),
                          history_db_name_));
     thumbnail_db_name_ =
-        profile_->GetPath().Append(chrome::kThumbnailsFilename);
+        profile_.GetPath().Append(chrome::kThumbnailsFilename);
     ASSERT_NO_FATAL_FAILURE(
         ExecuteSQLScript(data_path.AppendASCII("thumbnails.3.sql"),
                          thumbnail_db_name_));
@@ -109,7 +102,8 @@ class IconMappingMigrationTest : public HistoryUnitTestBase {
   base::FilePath thumbnail_db_name_;
 
  private:
-  scoped_ptr<TestingProfile> profile_;
+  content::TestBrowserThreadBundle thread_bundle_;
+  TestingProfile profile_;
 };
 
 TEST_F(ThumbnailDatabaseTest, GetFaviconAfterMigrationToTopSites) {