Revert 198844 "Move sequenced_task_runner to base/task"

Reverting revisions that rely on r198820 so to unbreak the build.

> Move sequenced_task_runner to base/task
> 
> BUG=
> R=akalin@chromium.org
> 
> Review URL: https://codereview.chromium.org/14927008

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/14985007

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

base/base.gypi

@@ -398,6 +398,9 @@
           'sequence_checker.h',
           'sequence_checker_impl.cc',
           'sequence_checker_impl.h',
+          'sequenced_task_runner.cc',
+          'sequenced_task_runner.h',
+          'sequenced_task_runner_helpers.h',
           'sha1.h',
           'sha1_portable.cc',
           'sha1_win.cc',
@@ -462,9 +465,6 @@
           'sys_info_openbsd.cc',
           'sys_info_posix.cc',
           'sys_info_win.cc',
-          'task/sequenced_task_runner.cc',
-          'task/sequenced_task_runner.h',
-          'task/sequenced_task_runner_helpers.h',
           'task_runner.cc',
           'task_runner.h',
           'task_runner_util.h',

base/deferred_sequenced_task_runner.h

@@ -12,8 +12,8 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
 #include "base/synchronization/lock.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/time.h"
 #include "base/tracked_objects.h"
 

base/message_loop.h

@@ -17,10 +17,10 @@
 #include "base/message_pump.h"
 #include "base/observer_list.h"
 #include "base/pending_task.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/lock.h"
-#include "base/task/sequenced_task_runner_helpers.h"
-#include "base/time.h"
 #include "base/tracking_info.h"
+#include "base/time.h"
 
 #if defined(OS_WIN)
 // We need this to declare base::MessagePumpWin::Dispatcher, which we should

base/prefs/json_pref_store.cc

@@ -13,7 +13,7 @@
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 

base/sequence_checker_impl.cc

@@ -4,7 +4,7 @@
 
 #include "base/sequence_checker_impl.h"
 
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 
 namespace base {
 

base/sequence_checker_impl_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

base/task/sequenced_task_runner.cc → base/sequenced_task_runner.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 
 #include "base/bind.h"
 

base/task/sequenced_task_runner.h → base/sequenced_task_runner.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_TASK_SEQUENCED_TASK_RUNNER_H_
-#define BASE_TASK_SEQUENCED_TASK_RUNNER_H_
+#ifndef BASE_SEQUENCED_TASKRUNNER_H_
+#define BASE_SEQUENCED_TASKRUNNER_H_
 
 #include "base/base_export.h"
-#include "base/task/sequenced_task_runner_helpers.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/task_runner.h"
 
 namespace base {
@@ -156,4 +156,4 @@ class BASE_EXPORT SequencedTaskRunner : public TaskRunner {
 
 }  // namespace base
 
-#endif  // BASE_TASK_SEQUENCED_TASK_RUNNER_H_
+#endif  // BASE_SEQUENCED_TASKRUNNER_H_

base/task/sequenced_task_runner_helpers.h → base/sequenced_task_runner_helpers.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_
-#define BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_
+#ifndef BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_
+#define BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_
 
 #include "base/basictypes.h"
 
@@ -109,4 +109,4 @@ class ReleaseHelperInternal {
 
 }  // namespace base
 
-#endif  // BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_
+#endif  // BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_

base/single_thread_task_runner.h

@@ -6,7 +6,7 @@
 #define BASE_SINGLE_THREAD_TASK_RUNNER_H_
 
 #include "base/base_export.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 
 namespace base {
 

base/test/sequenced_task_runner_test_template.h

@@ -17,9 +17,9 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/automation/automation_provider.h

@@ -21,8 +21,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/string16.h"
-#include "base/task/sequenced_task_runner_helpers.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"

chrome/browser/automation/automation_provider_observers.h

@@ -15,8 +15,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/sequenced_task_runner_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_tab_helper.h"

chrome/browser/automation/testing_automation_provider.cc

@@ -20,8 +20,8 @@
 #include "base/prefs/pref_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
+#include "base/sequenced_task_runner.h"
 #include "base/stringprintf.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"

chrome/browser/bookmarks/bookmark_model.cc

@@ -11,8 +11,8 @@
 #include "base/bind_helpers.h"
 #include "base/i18n/string_compare.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/sequenced_task_runner.h"
 #include "base/string_util.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"

chrome/browser/browsing_data/browsing_data_quota_helper.h

@@ -11,7 +11,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
-#include "base/task/sequenced_task_runner_helpers.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "webkit/quota/quota_types.h"
 
 class BrowsingDataQuotaHelper;

chrome/browser/browsing_data/browsing_data_remover.h

@@ -11,8 +11,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event_watcher.h"
-#include "base/task/sequenced_task_runner_helpers.h"
 #include "base/time.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/common/cancelable_task_tracker.h"

chrome/browser/chromeos/contacts/contact_database.cc

@@ -8,7 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/drive/drive_file_stream_reader.cc

@@ -9,7 +9,7 @@
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_reader.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"

chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc

@@ -12,7 +12,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_reader.h"

chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h"

chrome/browser/chromeos/drive/file_cache_metadata.cc

@@ -8,7 +8,7 @@
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/metrics/histogram.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"

chrome/browser/chromeos/drive/file_reader.cc

@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/platform_file.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"

chrome/browser/chromeos/drive/file_system/drive_operations.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_DRIVE_OPERATIONS_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 

chrome/browser/chromeos/drive/resource_metadata_unittest.cc

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "base/message_loop.h"
+#include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"

chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h

@@ -10,7 +10,7 @@
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "base/values.h"
 #include "chromeos/ime/component_extension_ime_manager.h"

chrome/browser/chromeos/input_method/input_method_configuration.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONFIGURATION_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONFIGURATION_H_
 
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 
 namespace chromeos {
 namespace input_method {

chrome/browser/chromeos/login/screen_locker.h

@@ -10,7 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task/sequenced_task_runner_helpers.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"

chrome/browser/chromeos/web_socket_proxy.cc

@@ -32,12 +32,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/sha1.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_byteorder.h"
-#include "base/task/sequenced_task_runner_helpers.h"
 #include "chrome/browser/chromeos/web_socket_proxy_helper.h"
 #include "chrome/browser/internal_auth.h"
 #include "chrome/common/chrome_notification_types.h"

chrome/browser/custom_handlers/protocol_handler_registry.h

@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/task/sequenced_task_runner_helpers.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"

chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/extensions/api/storage/settings_backend.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"

chrome/browser/extensions/crx_installer.cc

@@ -13,9 +13,9 @@
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
+#include "base/sequenced_task_runner.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"

chrome/browser/extensions/extension_function.h

@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
-#include "base/task/sequenced_task_runner_helpers.h"
+#include "base/sequenced_task_runner_helpers.h"
 #include "chrome/browser/extensions/extension_function_histogram_value.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/extensions/extension.h"

chrome/browser/extensions/sandboxed_unpacker.cc

@@ -16,7 +16,7 @@
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "base/utf_string_conversions.h"  // TODO(viettrungluu): delete me.
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_paths.h"

chrome/browser/extensions/test_extension_prefs.cc

@@ -13,8 +13,8 @@
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_value_store.h"
 #include "base/run_loop.h"
+#include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"

chrome/browser/extensions/updater/extension_updater_unittest.cc

@@ -16,12 +16,12 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
+#include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
-#include "base/task/sequenced_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/blacklist.h"

chrome/browser/managed_mode/managed_mode.cc

@@ -8,7 +8,7 @@
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/managed_mode/managed_mode_site_list.h"
 #include "chrome/browser/policy/url_blacklist_manager.h"

chrome/browser/managed_mode/managed_user_service.cc

@@ -6,7 +6,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
-#include "base/task/sequenced_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"