Retry 25770 after fixing Valgrind issue....

chrome/browser/history/history.cc

 // Copyright (c) 2006-2008 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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 22 matching lines @@
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/download_types.h"
 #include "chrome/browser/history/history_backend.h"
 #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"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 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
 // the history service (otherwise we would have to manually AddRef and
 // Release when the Backend has a reference to us).
 class HistoryService::BackendDelegate : public HistoryBackend::Delegate {
  public:
   explicit BackendDelegate(HistoryService* history_service)
       : history_service_(history_service),
         message_loop_(MessageLoop::current()) {
@@ skipping 26 matching lines @@
 
  private:
   scoped_refptr<HistoryService> history_service_;
   MessageLoop* message_loop_;
 };
 
 // static
 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.
   if (NotificationService::current()) {
     registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
                    Source<Profile>(profile_));
   }
 }
 
 HistoryService::HistoryService(Profile* profile)
-    : thread_(new base::Thread(kHistoryThreadName)),
+    : thread_(new ChromeHistoryThread()),
       profile_(profile),
       backend_loaded_(false) {
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
                  Source<Profile>(profile_));
 }
 
 HistoryService::~HistoryService() {
   // Shutdown the backend. This does nothing if Cleanup was already invoked.
   Cleanup();
 }
@@ skipping 540 matching lines @@
   NotificationService::current()->Notify(type, source, det);
 }
 
 void HistoryService::OnDBLoaded() {
   LOG(INFO) << "History backend finished loading";
   backend_loaded_ = true;
   NotificationService::current()->Notify(NotificationType::HISTORY_LOADED,
                                          Source<Profile>(profile_),
                                          Details<HistoryService>(this));
 }