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

1 files changed, 7 insertions, 2 deletions

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.