Remove TopSites::IsEnabled() as well as related dead code.

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/top_sites.h"

[sky, 2011/01/13 16:55:52]

You should be able to remove this now.

[satorux1, 2011/01/14 07:36:46]

Done.

 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 376 matching lines @@
   // There should still be visits.
   visits.clear();
   backend_->db_->GetVisitsForURL(row1_id, &visits);
   EXPECT_EQ(1U, visits.size());
 
   // The favicon should still be valid.
   EXPECT_EQ(favicon1,
       backend_->thumbnail_db_->GetFavIconIDForFavIconURL(favicon_url1));
 }
 
-TEST_F(HistoryBackendTest, GetPageThumbnailAfterRedirects) {
-  ASSERT_TRUE(backend_.get());
-  if (history::TopSites::IsEnabled())
-    return;
-
-  const char* base_url = "http://mail";
-  const char* thumbnail_url = "http://mail.google.com";
-  const char* first_chain[] = {
-    base_url,
-    thumbnail_url,
-    NULL
-  };
-  AddRedirectChain(first_chain, 0);
-
-  // Add a thumbnail for the end of that redirect chain.
-  scoped_ptr<SkBitmap> thumbnail(
-      gfx::JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
-  backend_->SetPageThumbnail(GURL(thumbnail_url), *thumbnail,
-                             ThumbnailScore(0.25, true, true));
-
-  // Write a second URL chain so that if you were to simply check what
-  // "http://mail" redirects to, you wouldn't see the URL that has
-  // contains the thumbnail.
-  const char* second_chain[] = {
-    base_url,
-    "http://mail.google.com/somewhere/else",
-    NULL
-  };
-  AddRedirectChain(second_chain, 1);
-
-  // Now try to get the thumbnail for the base url. It shouldn't be
-  // distracted by the second chain and should return the thumbnail
-  // attached to thumbnail_url_.
-  scoped_refptr<RefCountedBytes> data;
-  backend_->GetPageThumbnailDirectly(GURL(base_url), &data);
-
-  EXPECT_TRUE(data.get());
-}
-
 // Tests a handful of assertions for a navigation with a type of
 // KEYWORD_GENERATED.
 TEST_F(HistoryBackendTest, KeywordGenerated) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://google.com");
 
   Time visit_time = Time::Now() - base::TimeDelta::FromDays(1);
   scoped_refptr<HistoryAddPageArgs> request(
       new HistoryAddPageArgs(url, visit_time, NULL, 0, GURL(),
@@ skipping 142 matching lines @@
 
   // Fetch the row information about stripped url from history db.
   VisitVector visits;
   URLID row_id = backend_->db_->GetRowForURL(stripped_url, NULL);
   backend_->db_->GetVisitsForURL(row_id, &visits);
 
   // Check if stripped url is stored in database.
   ASSERT_EQ(1U, visits.size());
 }
 
-TEST_F(HistoryBackendTest, DeleteThumbnailsDatabaseTest) {
-  if (history::TopSites::IsEnabled())
-    return;
-
-  EXPECT_TRUE(backend_->thumbnail_db_->NeedsMigrationToTopSites());
-  backend_->delegate_->StartTopSitesMigration();
-  EXPECT_FALSE(backend_->thumbnail_db_->NeedsMigrationToTopSites());
-}
-
 TEST_F(HistoryBackendTest, AddPageVisitSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://www.google.com");
 
   // Clear all history.
   backend_->DeleteAllHistory();
 
   // Assume visiting the url from an externsion.
   backend_->AddPageVisit(url, base::Time::Now(), 0, PageTransition::TYPED,
@@ skipping 194 matching lines @@
 
   // Check visit_source table is created and empty.
   s.Assign(db.GetUniqueStatement(
       "SELECT name FROM sqlite_master WHERE name=\"visit_source\""));
   ASSERT_TRUE(s.Step());
   s.Assign(db.GetUniqueStatement("SELECT * FROM visit_source LIMIT 10"));
   EXPECT_FALSE(s.Step());
 }
 
 }  // namespace history