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

3 files changed, 1 insertions, 18 deletions

diff --git a/chrome/test/data/profiles/typical_history/Default/History b/chrome/test/data/profiles/typical_history/Default/History
index cf186c9..98481ce 100644
--- a/chrome/test/data/profiles/typical_history/Default/History
+++ b/chrome/test/data/profiles/typical_history/Default/History
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 48d2e51..547aff0 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -178,10 +178,6 @@ TestingProfile::~TestingProfile() {
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
   DestroyWebDataService();
-  history::TopSites::DeleteTopSites(top_sites_);
-  if (top_sites_.get())
-    top_sites_->ClearProfile();
-
   file_util::Delete(path_, true);
 }
 
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index dd8976e..36f638f 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -9,7 +9,6 @@
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_prefs.h"
@@ -21,7 +20,6 @@
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/pref_service.h"
@@ -165,16 +163,7 @@ class TestingProfile : public Profile {
     return template_url_model_.get();
   }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() { return NULL; }
-  virtual history::TopSites* GetTopSites() {
-    if (!top_sites_.get()) {
-      top_sites_ = new history::TopSites(this);
-      if (!temp_dir_.CreateUniqueTempDir())
-        return NULL;
-      FilePath file_name = temp_dir_.path().AppendASCII("TopSites.db");
-      top_sites_->Init(file_name);
-    }
-    return top_sites_;
-  }
+  virtual history::TopSites* GetTopSites() { return NULL; }
   virtual DownloadManager* GetDownloadManager() { return NULL; }
   virtual PersonalDataManager* GetPersonalDataManager() { return NULL; }
   virtual bool HasCreatedDownloadManager() const { return false; }
@@ -383,8 +372,6 @@ class TestingProfile : public Profile {
   scoped_ptr<FindBarState> find_bar_state_;
 
   FilePath last_selected_directory_;
-  scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
-  ScopedTempDir temp_dir_;
 };
 
 // A profile that derives from another profile.  This does not actually