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

Unified Diff: chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. Created 7 years, 5 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/ui/search/instant_ntp_prerenderer_unittest.cc
diff --git a/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc
index 374c8fd8a882eb095aa26de76c930003cc4ffd9e..0535657142e2ba4addc4243009252a5f65465c4d 100644
--- a/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc
@@ -14,7 +14,7 @@
#include "chrome/common/content_settings.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::HistogramBase;
@@ -136,11 +136,7 @@ private:
class InstantNTPPrerendererTest : public testing::Test {
public:
InstantNTPPrerendererTest()
- : ui_thread_(content::BrowserThread::UI),
- instant_ntp_prerenderer_(new TestableInstantNTPPrerenderer(&profile_)) {
- }
-
- virtual void SetUp() OVERRIDE {
+ : instant_ntp_prerenderer_(new TestableInstantNTPPrerenderer(&profile_)) {
base::StatisticsRecorder::Initialize();
}
@@ -153,7 +149,7 @@ class InstantNTPPrerendererTest : public testing::Test {
}
private:
- content::TestBrowserThread ui_thread_;
+ content::TestBrowserThreadBundle thread_bundle_;
scoped_ptr<TestableInstantNTPPrerenderer> instant_ntp_prerenderer_;
mutable TestingProfile profile_;
};
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698