Switch history thread back to base::Thread. Sync unit tests require more than one history thread.

We hope to have a hard unit test dependency on buildbot soon, but we need to fix our tests again now.
BUG=22056
Review URL: http://codereview.chromium.org/215023

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

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/chrome_thread.cc b/chrome/browser/chrome_thread.cc
index 2124c40..8cd7767 100644
--- a/chrome/browser/chrome_thread.cc
+++ b/chrome/browser/chrome_thread.cc
@@ -11,7 +11,6 @@ static const char* chrome_thread_names[ChromeThread::ID_COUNT] = {
   "Chrome_FileThread",  // FILE
   "Chrome_DBThread",  // DB
   "Chrome_WebKitThread",  // WEBKIT
-  "Chrome_HistoryThread",  // HISTORY
 #if defined(OS_LINUX)
   "Chrome_Background_X11Thread",  // BACKGROUND_X11
 #endif
@@ -25,7 +24,6 @@ ChromeThread* ChromeThread::chrome_threads_[ID_COUNT] = {
   NULL,  // FILE
   NULL,  // DB
   NULL,  // WEBKIT
-  NULL,  // HISTORY
 #if defined(OS_LINUX)
   NULL,  // BACKGROUND_X11
 #endif
diff --git a/chrome/browser/chrome_thread.h b/chrome/browser/chrome_thread.h
index db95512e..28e308f 100644
--- a/chrome/browser/chrome_thread.h
+++ b/chrome/browser/chrome_thread.h
@@ -45,9 +45,6 @@ class ChromeThread : public base::Thread {
     // NOT in --single-process mode.
     WEBKIT,
 
-    // This is the thread that interacts with the history database.
-    HISTORY,
-
 #if defined(OS_LINUX)
     // This thread has a second connection to the X server and is used to
     // process UI requests when routing the request to the UI thread would risk
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 7b18da4..057a654 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -56,9 +56,14 @@ using history::HistoryBackend;
 
 namespace {
 
-class ChromeHistoryThread : public ChromeThread {
+// The history thread is intentionally not a ChromeThread because the
+// sync integration unit tests depend on being able to create more than one
+// history thread.
+static const char* kHistoryThreadName = "Chrome_HistoryThread";
+
+class ChromeHistoryThread : public base::Thread {
  public:
-  ChromeHistoryThread() : ChromeThread(ChromeThread::HISTORY) {}
+  ChromeHistoryThread() : base::Thread(kHistoryThreadName) {}
   virtual ~ChromeHistoryThread() {
     // We cannot rely on our base class to call Stop() since we want our
     // CleanUp function to run.