Retry 25770 after fixing Valgrind issue.

Enable database logging on history thread.
Original review: http://codereview.chromium.org/198011

BUG=16591
TEST=History UI test


Review URL: http://codereview.chromium.org/194067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25842 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 41 insertions, 4 deletions

diff --git a/base/thread.cc b/base/thread.cc
index f447fbb..dcda330 100644
--- a/base/thread.cc
+++ b/base/thread.cc
@@ -135,6 +135,10 @@ void Thread::StopSoon() {
   message_loop_->PostTask(FROM_HERE, new ThreadQuitTask());
 }
 
+void Thread::Run(MessageLoop* message_loop) {
+  message_loop->Run();
+}
+
 void Thread::ThreadMain() {
   // The message loop for this thread.
   MessageLoop message_loop(startup_data_->options.message_loop_type);
@@ -153,7 +157,7 @@ void Thread::ThreadMain() {
   // startup_data_ can't be touched anymore since the starting thread is now
   // unlocked.
 
-  message_loop.Run();
+  Run(message_loop_);
 
   // Let the thread do extra cleanup.
   CleanUp();
diff --git a/base/thread.h b/base/thread.h
index d1aae0e..36daa7f 100644
--- a/base/thread.h
+++ b/base/thread.h
@@ -114,6 +114,9 @@ class Thread : PlatformThread::Delegate {
   // Called just prior to starting the message loop
   virtual void Init() {}
 
+  // Called to start the message loop
+  virtual void Run(MessageLoop* message_loop);
+
   // Called just after the message loop ends
   virtual void CleanUp() {}
 
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 8310c23..7b18da4 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -40,6 +40,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
+#include "chrome/browser/history/visit_log.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/common/chrome_constants.h"
@@ -53,7 +54,30 @@
 using base::Time;
 using history::HistoryBackend;
 
-static const char* kHistoryThreadName = "Chrome_HistoryThread";
+namespace {
+
+class ChromeHistoryThread : public ChromeThread {
+ public:
+  ChromeHistoryThread() : ChromeThread(ChromeThread::HISTORY) {}
+  virtual ~ChromeHistoryThread() {
+    // We cannot rely on our base class to call Stop() since we want our
+    // CleanUp function to run.
+    Stop();
+  }
+ protected:
+  virtual void CleanUp() {
+    history::ClearVisitLog();
+  }
+  virtual void Run(MessageLoop* message_loop) {
+    // Allocate VisitLog on local stack so it will be saved in crash dump.
+    history::VisitLog visit_log;
+    history::InitVisitLog(&visit_log);
+    message_loop->Run();
+    history::ClearVisitLog();
+  }
+};
+
+}  // namespace
 
 // Sends messages from the backend to us on the main thread. This must be a
 // separate class from the history service so that it can hold a reference to
@@ -100,7 +124,7 @@ class HistoryService::BackendDelegate : public HistoryBackend::Delegate {
 const history::StarID HistoryService::kBookmarkBarID = 1;
 
 HistoryService::HistoryService()
-    : thread_(new base::Thread(kHistoryThreadName)),
+    : thread_(new ChromeHistoryThread()),
       profile_(NULL),
       backend_loaded_(false) {
   // Is NULL when running generate_profile.
@@ -111,7 +135,7 @@ HistoryService::HistoryService()
 }
 
 HistoryService::HistoryService(Profile* profile)
-    : thread_(new base::Thread(kHistoryThreadName)),
+    : thread_(new ChromeHistoryThread()),
       profile_(profile),
       backend_loaded_(false) {
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
diff --git a/chrome/browser/history/visit_log.cc b/chrome/browser/history/visit_log.cc
index 2c74265..00f9fdc 100644
--- a/chrome/browser/history/visit_log.cc
+++ b/chrome/browser/history/visit_log.cc
@@ -53,4 +53,9 @@ void AddEventToVisitLog(VisitLog::EventType event) {
   g_visit_log->AddEvent(event);
 }
 
+void ClearVisitLog() {
+  g_visit_log = NULL;
+}
+
+
 }  // namespace history
diff --git a/chrome/browser/history/visit_log.h b/chrome/browser/history/visit_log.h
index 31c4976..4e1634c 100644
--- a/chrome/browser/history/visit_log.h
+++ b/chrome/browser/history/visit_log.h
@@ -55,6 +55,7 @@ class VisitLog {
 
 void InitVisitLog(VisitLog* vlog);
 void AddEventToVisitLog(VisitLog::EventType event);
+void ClearVisitLog();
 
 }  // namespace history