diff options
| author | nshkrob@chromium.org <nshkrob@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 20:02:08 +0000 |
|---|---|---|
| committer | nshkrob@chromium.org <nshkrob@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 20:02:08 +0000 |
| commit | 9ba20809ed26f2dc47444c44e1f34b810b2760fc (patch) | |
| tree | 1ad0e088ae731b7c9ab84b9325ae524a06916ac6 /chrome/browser/history/history_unittest.cc | |
| parent | a4333ed375fb65d805ce721fd68c21190811b5b0 (diff) | |
| download | chromium_src-9ba20809ed26f2dc47444c44e1f34b810b2760fc.zip chromium_src-9ba20809ed26f2dc47444c44e1f34b810b2760fc.tar.gz chromium_src-9ba20809ed26f2dc47444c44e1f34b810b2760fc.tar.bz2 | |
Replace --top-sites flag with --no-top-sites flag. TopSites becomes the default.
BUG=none
TEST=manual
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=55244
Review URL: http://codereview.chromium.org/3054028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_unittest.cc')
| -rw-r--r-- | chrome/browser/history/history_unittest.cc | 5 |
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)); |