Revert 111695 - Have content/ create and destroy its own threads.

chrome/browser/sync/tools/sync_listen_notifications.cc

 // Copyright (c) 2011 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.
 
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
-#include "base/threading/thread.h"
 #include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
 #include "chrome/browser/sync/notifier/sync_notifier.h"
 #include "chrome/browser/sync/notifier/sync_notifier_factory.h"
 #include "chrome/browser/sync/notifier/sync_notifier_observer.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
 #include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/browser/browser_thread_impl.h"
 
 using content::BrowserThread;
 
 // This is a simple utility that initializes a sync notifier and
 // listens to any received notifications.
 
 namespace {
 
 // Class to print received notifications events.
 class NotificationPrinter : public sync_notifier::SyncNotifierObserver {
@@ skipping 53 matching lines @@
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
   logging::InitLogging(
       NULL,
       logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   MessageLoop ui_loop;
-  content::BrowserThreadImpl ui_thread(BrowserThread::UI, &ui_loop);
-  content::BrowserThreadImpl io_thread(BrowserThread::IO);
+  content::DeprecatedBrowserThread ui_thread(BrowserThread::UI, &ui_loop);
+
+  content::DeprecatedBrowserThread io_thread(BrowserThread::IO);
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   io_thread.StartWithOptions(options);
 
   // Parse command line.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   std::string email = command_line.GetSwitchValueASCII("email");
   std::string token = command_line.GetSwitchValueASCII("token");
   // TODO(akalin): Write a wrapper script that gets a token for an
   // email and password and passes that in to this utility.
@@ skipping 33 matching lines @@
     }
     sync_notifier->UpdateEnabledTypes(types);
   }
 
   ui_loop.Run();
 
   sync_notifier->RemoveObserver(&notification_printer);
   io_thread.Stop();
   return 0;
 }