summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-31 02:29:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-31 02:29:20 +0000
commit5e9e96aae1a78860b984124519f720163fc52a33 (patch)
treed29e8de21b25f313cf93d1c939fc1dd3083b92f4 /sync
parent16efcd1cd7d75552d6ef14632030520d9bb3986c (diff)
downloadchromium_src-5e9e96aae1a78860b984124519f720163fc52a33.zip
chromium_src-5e9e96aae1a78860b984124519f720163fc52a33.tar.gz
chromium_src-5e9e96aae1a78860b984124519f720163fc52a33.tar.bz2
Move MessageLoop to base namespace.
This adds a "using" to the header to avoid having to update everything at once. However, all forward declares and the locations that use the forward declares need to be updated (since they don't see the using in message_loop.h). BUG= Review URL: https://codereview.chromium.org/13243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/engine/sync_scheduler.h2
-rw-r--r--sync/engine/sync_scheduler_impl.h2
-rw-r--r--sync/internal_api/public/engine/passive_model_worker.h6
-rw-r--r--sync/internal_api/public/http_bridge.h7
4 files changed, 10 insertions, 7 deletions
diff --git a/sync/engine/sync_scheduler.h b/sync/engine/sync_scheduler.h
index db21ab0..b2ebbe3 100644
--- a/sync/engine/sync_scheduler.h
+++ b/sync/engine/sync_scheduler.h
@@ -16,8 +16,6 @@
#include "sync/internal_api/public/base/model_type_invalidation_map.h"
#include "sync/sessions/sync_session.h"
-class MessageLoop;
-
namespace tracked_objects {
class Location;
} // namespace tracked_objects
diff --git a/sync/engine/sync_scheduler_impl.h b/sync/engine/sync_scheduler_impl.h
index 4fc8c17..f3c4d5a 100644
--- a/sync/engine/sync_scheduler_impl.h
+++ b/sync/engine/sync_scheduler_impl.h
@@ -285,7 +285,7 @@ class SYNC_EXPORT_PRIVATE SyncSchedulerImpl : public SyncScheduler {
// The message loop this object is on. Almost all methods have to
// be called on this thread.
- MessageLoop* const sync_loop_;
+ base::MessageLoop* const sync_loop_;
// Set in Start(), unset in Stop().
bool started_;
diff --git a/sync/internal_api/public/engine/passive_model_worker.h b/sync/internal_api/public/engine/passive_model_worker.h
index 4b01606..a6ea011 100644
--- a/sync/internal_api/public/engine/passive_model_worker.h
+++ b/sync/internal_api/public/engine/passive_model_worker.h
@@ -11,7 +11,9 @@
#include "sync/internal_api/public/engine/model_safe_worker.h"
#include "sync/internal_api/public/util/syncer_error.h"
+namespace base {
class MessageLoop;
+}
namespace syncer {
@@ -20,7 +22,7 @@ namespace syncer {
// thread).
class SYNC_EXPORT PassiveModelWorker : public ModelSafeWorker {
public:
- explicit PassiveModelWorker(const MessageLoop* sync_loop);
+ explicit PassiveModelWorker(const base::MessageLoop* sync_loop);
// ModelSafeWorker implementation. Called on the sync thread.
virtual SyncerError DoWorkAndWaitUntilDone(
@@ -30,7 +32,7 @@ class SYNC_EXPORT PassiveModelWorker : public ModelSafeWorker {
private:
virtual ~PassiveModelWorker();
- const MessageLoop* const sync_loop_;
+ const base::MessageLoop* const sync_loop_;
DISALLOW_COPY_AND_ASSIGN(PassiveModelWorker);
};
diff --git a/sync/internal_api/public/http_bridge.h b/sync/internal_api/public/http_bridge.h
index 31863fd..6619adf 100644
--- a/sync/internal_api/public/http_bridge.h
+++ b/sync/internal_api/public/http_bridge.h
@@ -21,9 +21,12 @@
#include "sync/internal_api/public/http_post_provider_factory.h"
#include "sync/internal_api/public/http_post_provider_interface.h"
-class MessageLoop;
class HttpBridgeTest;
+namespace base {
+class MessageLoop;
+}
+
namespace net {
class HttpResponseHeaders;
class HttpUserAgentSettings;
@@ -157,7 +160,7 @@ class SYNC_EXPORT_PRIVATE HttpBridge
// the network.
// This should be the main syncer thread (SyncerThread) which is what blocks
// on network IO through curl_easy_perform.
- MessageLoop* const created_on_loop_;
+ base::MessageLoop* const created_on_loop_;
// The URL to POST to.
GURL url_for_request_;