chrome: Use base::MessageLoop. (Part 3)

chrome/browser/sync/glue/password_model_associator.cc

Index: chrome/browser/sync/glue/password_model_associator.cc
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index 33e0e2f7a09422de45eaaec019e7b471b26378ee..154eaf3f5e91aa5695c67ad472875ecb88159fce 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -34,7 +34,7 @@ PasswordModelAssociator::PasswordModelAssociator(
       password_store_(password_store),
       password_node_id_(syncer::kInvalidId),
       abort_association_pending_(false),
-      expected_loop_(MessageLoop::current()),
+      expected_loop_(base::MessageLoop::current()),
       error_handler_(error_handler) {
   DCHECK(sync_service_);
 #if defined(OS_MACOSX)
@@ -50,7 +50,7 @@ syncer::SyncError PasswordModelAssociator::AssociateModels(
     syncer::SyncMergeResult* local_merge_result,
     syncer::SyncMergeResult* syncer_merge_result) {
   syncer::SyncError error;
-  DCHECK(expected_loop_ == MessageLoop::current());
+  DCHECK(expected_loop_ == base::MessageLoop::current());
   {
     base::AutoLock lock(abort_association_pending_lock_);
     abort_association_pending_ = false;
@@ -181,9 +181,10 @@ syncer::SyncError PasswordModelAssociator::AssociateModels(
 
 bool PasswordModelAssociator::DeleteAllNodes(
     syncer::WriteTransaction* trans) {
-  DCHECK(expected_loop_ == MessageLoop::current());
+  DCHECK(expected_loop_ == base::MessageLoop::current());
   for (PasswordToSyncIdMap::iterator node_id = id_map_.begin();
-       node_id != id_map_.end(); ++node_id) {
+       node_id != id_map_.end();
+       ++node_id) {
     syncer::WriteNode sync_node(trans);
     if (sync_node.InitByIdLookup(node_id->second) !=
             syncer::BaseNode::INIT_OK) {
@@ -266,7 +267,7 @@ int64 PasswordModelAssociator::GetSyncIdFromChromeId(
 
 void PasswordModelAssociator::Associate(
     const std::string* password, int64 sync_id) {
-  DCHECK(expected_loop_ == MessageLoop::current());
+  DCHECK(expected_loop_ == base::MessageLoop::current());
   DCHECK_NE(syncer::kInvalidId, sync_id);
   DCHECK(id_map_.find(*password) == id_map_.end());
   DCHECK(id_map_inverse_.find(sync_id) == id_map_inverse_.end());
@@ -275,7 +276,7 @@ void PasswordModelAssociator::Associate(
 }
 
 void PasswordModelAssociator::Disassociate(int64 sync_id) {
-  DCHECK(expected_loop_ == MessageLoop::current());
+  DCHECK(expected_loop_ == base::MessageLoop::current());
   SyncIdToPasswordMap::iterator iter = id_map_inverse_.find(sync_id);
   if (iter == id_map_inverse_.end())
     return;