Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Unified Diff: chrome/browser/history/thumbnail_database_unittest.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android webview init fix merged in. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 75758e7cad351a341b4ac3d42689a90d8939fc20..ea911bdbf7cc32e24433c9532ee5214703577b2b 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,26 +79,18 @@ 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);
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_));
@@ -108,7 +101,8 @@ class IconMappingMigrationTest : public HistoryUnitTestBase {
base::FilePath thumbnail_db_name_;
private:
- scoped_ptr<TestingProfile> profile_;
+ content::TestBrowserThreadBundle thread_bundle_;
+ TestingProfile profile_;
};
TEST_F(ThumbnailDatabaseTest, AddIconMapping) {

Powered by Google App Engine
This is Rietveld 408576698