summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/history_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 19:46:57 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 19:46:57 +0000
commitbbe192b6e32035bae275f798bd495d136a1a1d68 (patch)
tree4e094f9446b48dcf01d331b44e298fd807f61fd7 /chrome/browser/history/history_unittest.cc
parent145db1f5370109e0abcd324c37424dded8a501df (diff)
downloadchromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.zip
chromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.tar.gz
chromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.tar.bz2
Revert "Replace --top-sites flag with --no-top-sites flag. TopSites becomes the default."
Introduced new crashes. TBR=nshkrob Review URL: http://codereview.chromium.org/3026059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_unittest.cc')
-rw-r--r--chrome/browser/history/history_unittest.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 063414f..c8db05a 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -24,7 +24,6 @@
#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"
@@ -42,7 +41,6 @@
#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"
@@ -687,9 +685,6 @@ 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));