summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/history_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/history/history_unittest.cc')
-rw-r--r--chrome/browser/history/history_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index c8db05a..063414f 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -24,6 +24,7 @@
#include "app/sql/statement.h"
#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/message_loop.h"
@@ -41,6 +42,7 @@
#include "chrome/browser/history/in_memory_history_backend.h"
#include "chrome/browser/history/page_usage_data.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/thumbnail_score.h"
#include "chrome/tools/profiles/thumbnail-inl.h"
@@ -685,6 +687,9 @@ TEST_F(HistoryTest, Segments) {
// This just tests history system -> thumbnail database integration, the actual
// thumbnail tests are in its own file.
TEST_F(HistoryTest, Thumbnails) {
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoTopSites))
+ return; // TopSitesTest replaces this.
+
scoped_refptr<HistoryService> history(new HistoryService);
history_service_ = history;
ASSERT_TRUE(history->Init(history_dir_, NULL));