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

5 files changed, 18 insertions, 1 deletions

diff --git a/chrome/test/data/profiles/typical_history/Default/Thumbnails b/chrome/test/data/profiles/typical_history/Default/Favicons
index fc26118..b42db08 100644
--- a/chrome/test/data/profiles/typical_history/Default/Thumbnails
+++ b/chrome/test/data/profiles/typical_history/Default/Favicons
diff --git a/chrome/test/data/profiles/typical_history/Default/History b/chrome/test/data/profiles/typical_history/Default/History
index 98481ce..cf186c9 100644
--- a/chrome/test/data/profiles/typical_history/Default/History
+++ b/chrome/test/data/profiles/typical_history/Default/History
diff --git a/chrome/test/data/profiles/typical_history/Default/Top Sites b/chrome/test/data/profiles/typical_history/Default/Top Sites
new file mode 100644
index 0000000..2661211
--- /dev/null
+++ b/chrome/test/data/profiles/typical_history/Default/Top Sites
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 547aff0..e0a3968 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -178,6 +178,10 @@ TestingProfile::~TestingProfile() {
   // FaviconService depends on HistoryServce so destroying it later.
   DestroyFaviconService();
   DestroyWebDataService();
+  if (top_sites_.get())
+    top_sites_->ClearProfile();
+  history::TopSites::DeleteTopSites(top_sites_);
+
   file_util::Delete(path_, true);
 }
 
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 36f638f..dd8976e 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -9,6 +9,7 @@
 #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"
@@ -20,6 +21,7 @@
 #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"
@@ -163,7 +165,16 @@ class TestingProfile : public Profile {
     return template_url_model_.get();
   }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() { return NULL; }
-  virtual history::TopSites* GetTopSites() { 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 DownloadManager* GetDownloadManager() { return NULL; }
   virtual PersonalDataManager* GetPersonalDataManager() { return NULL; }
   virtual bool HasCreatedDownloadManager() const { return false; }
@@ -372,6 +383,8 @@ 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