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
CrOS-Libchrome-Original-Commit: fb441961d60063478f9c4e8cf57b9968f28e6aef
diff --git a/base/base.gypi b/base/base.gypi
index b3647d5..be869ce 100644
--- a/base/base.gypi
+++ b/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',
diff --git a/base/deferred_sequenced_task_runner.h b/base/deferred_sequenced_task_runner.h
index d3a0e5e..d1cdb43 100644
--- a/base/deferred_sequenced_task_runner.h
+++ b/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"
diff --git a/base/message_loop.h b/base/message_loop.h
index 433d311..f3ad3a5 100644
--- a/base/message_loop.h
+++ b/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
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index c651f3f..0d3d42e 100644
--- a/base/prefs/json_pref_store.cc
+++ b/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"
diff --git a/base/sequence_checker_impl.cc b/base/sequence_checker_impl.cc
index beb81d9..24d9ed9 100644
--- a/base/sequence_checker_impl.cc
+++ b/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 {
diff --git a/base/sequence_checker_impl_unittest.cc b/base/sequence_checker_impl_unittest.cc
index dd469ea..4e601b0 100644
--- a/base/sequence_checker_impl_unittest.cc
+++ b/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"
diff --git a/base/task/sequenced_task_runner.cc b/base/sequenced_task_runner.cc
similarity index 94%
rename from base/task/sequenced_task_runner.cc
rename to base/sequenced_task_runner.cc
index 1d1da81..00d4048 100644
--- a/base/task/sequenced_task_runner.cc
+++ b/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"
diff --git a/base/task/sequenced_task_runner.h b/base/sequenced_task_runner.h
similarity index 96%
rename from base/task/sequenced_task_runner.h
rename to base/sequenced_task_runner.h
index 1e4973d..f6ca646 100644
--- a/base/task/sequenced_task_runner.h
+++ b/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 @@
} // namespace base
-#endif // BASE_TASK_SEQUENCED_TASK_RUNNER_H_
+#endif // BASE_SEQUENCED_TASKRUNNER_H_
diff --git a/base/task/sequenced_task_runner_helpers.h b/base/sequenced_task_runner_helpers.h
similarity index 95%
rename from base/task/sequenced_task_runner_helpers.h
rename to base/sequenced_task_runner_helpers.h
index 4a5d2e8..2d0d493 100644
--- a/base/task/sequenced_task_runner_helpers.h
+++ b/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 @@
} // namespace base
-#endif // BASE_TASK_SEQUENCED_TASK_RUNNER_HELPERS_H_
+#endif // BASE_SEQUENCED_TASK_RUNNER_HELPERS_H_
diff --git a/base/single_thread_task_runner.h b/base/single_thread_task_runner.h
index 894bad9..e82941a 100644
--- a/base/single_thread_task_runner.h
+++ b/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 {
diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h
index ab3d2eb..761eefd 100644
--- a/base/test/sequenced_task_runner_test_template.h
+++ b/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"