[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings

Since (almost) everything in sync/ is now in the 'syncer' namespace,
all of these are redundant.

Clean up indentation.

Put sync_{client,listen_notifications} into syncer namespace.

BUG=128060
TEST=


Review URL: https://chromiumcodereview.appspot.com/10795018

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

5 files changed, 20 insertions, 21 deletions

diff --git a/sync/internal_api/public/sessions/model_neutral_state.h b/sync/internal_api/public/sessions/model_neutral_state.h
index a9c1c44..6b0cec8 100644
--- a/sync/internal_api/public/sessions/model_neutral_state.h
+++ b/sync/internal_api/public/sessions/model_neutral_state.h
@@ -23,7 +23,7 @@ struct ModelNeutralState {
 
   // We GetUpdates for some combination of types at once.
   // requested_update_types stores the set of types which were requested.
-  syncer::ModelTypeSet updates_request_types;
+  ModelTypeSet updates_request_types;
 
   sync_pb::ClientToServerResponse updates_response;
 
@@ -39,7 +39,7 @@ struct ModelNeutralState {
 
   // If the syncer encountered a MIGRATION_DONE code, these are the types that
   // the client must now "migrate", by purging and re-downloading all updates.
-  syncer::ModelTypeSet types_needing_local_migration;
+  ModelTypeSet types_needing_local_migration;
 
   // Overwrites due to conflict resolution counters.
   int num_local_overwrites;
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index 42b990d..5e1e4e7 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -28,8 +28,8 @@ SyncSessionSnapshot::SyncSessionSnapshot()
 SyncSessionSnapshot::SyncSessionSnapshot(
     const ModelNeutralState& model_neutral_state,
     bool is_share_usable,
-    syncer::ModelTypeSet initial_sync_ended,
-    const syncer::ModelTypePayloadMap& download_progress_markers,
+    ModelTypeSet initial_sync_ended,
+    const ModelTypePayloadMap& download_progress_markers,
     bool more_to_sync,
     bool is_silenced,
     int num_encryption_conflicts,
@@ -82,9 +82,9 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
       static_cast<int>(model_neutral_state_.num_server_changes_remaining));
   value->SetBoolean("isShareUsable", is_share_usable_);
   value->Set("initialSyncEnded",
-             syncer::ModelTypeSetToValue(initial_sync_ended_));
+             ModelTypeSetToValue(initial_sync_ended_));
   value->Set("downloadProgressMarkers",
-             syncer::ModelTypePayloadMapToValue(download_progress_markers_));
+             ModelTypePayloadMapToValue(download_progress_markers_));
   value->SetBoolean("hasMoreToSync", has_more_to_sync_);
   value->SetBoolean("isSilenced", is_silenced_);
   // We don't care too much if we lose precision here, also.
@@ -119,12 +119,11 @@ bool SyncSessionSnapshot::is_share_usable() const {
   return is_share_usable_;
 }
 
-syncer::ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
+ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
   return initial_sync_ended_;
 }
 
-syncer::ModelTypePayloadMap
-    SyncSessionSnapshot::download_progress_markers() const {
+ModelTypePayloadMap SyncSessionSnapshot::download_progress_markers() const {
   return download_progress_markers_;
 }
 
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.h b/sync/internal_api/public/sessions/sync_session_snapshot.h
index d599f9d..d6fb025 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.h
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.h
@@ -32,8 +32,8 @@ class SyncSessionSnapshot {
   SyncSessionSnapshot(
       const ModelNeutralState& model_neutral_state,
       bool is_share_usable,
-      syncer::ModelTypeSet initial_sync_ended,
-      const syncer::ModelTypePayloadMap& download_progress_markers,
+      ModelTypeSet initial_sync_ended,
+      const ModelTypePayloadMap& download_progress_markers,
       bool more_to_sync,
       bool is_silenced,
       int num_encryption_conflicts,
@@ -57,8 +57,8 @@ class SyncSessionSnapshot {
   }
   int64 num_server_changes_remaining() const;
   bool is_share_usable() const;
-  syncer::ModelTypeSet initial_sync_ended() const;
-  syncer::ModelTypePayloadMap download_progress_markers() const;
+  ModelTypeSet initial_sync_ended() const;
+  ModelTypePayloadMap download_progress_markers() const;
   bool has_more_to_sync() const;
   bool is_silenced() const;
   int num_encryption_conflicts() const;
@@ -77,8 +77,8 @@ class SyncSessionSnapshot {
  private:
   ModelNeutralState model_neutral_state_;
   bool is_share_usable_;
-  syncer::ModelTypeSet initial_sync_ended_;
-  syncer::ModelTypePayloadMap download_progress_markers_;
+  ModelTypeSet initial_sync_ended_;
+  ModelTypePayloadMap download_progress_markers_;
   bool has_more_to_sync_;
   bool is_silenced_;
   int num_encryption_conflicts_;
diff --git a/sync/internal_api/public/sessions/sync_source_info.cc b/sync/internal_api/public/sessions/sync_source_info.cc
index e133f08..9e15289 100644
--- a/sync/internal_api/public/sessions/sync_source_info.cc
+++ b/sync/internal_api/public/sessions/sync_source_info.cc
@@ -13,12 +13,12 @@ namespace sessions {
 SyncSourceInfo::SyncSourceInfo()
     : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN) {}
 
-SyncSourceInfo::SyncSourceInfo(const syncer::ModelTypePayloadMap& t)
+SyncSourceInfo::SyncSourceInfo(const ModelTypePayloadMap& t)
     : updates_source(sync_pb::GetUpdatesCallerInfo::UNKNOWN), types(t) {}
 
 SyncSourceInfo::SyncSourceInfo(
     const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u,
-    const syncer::ModelTypePayloadMap& t)
+    const ModelTypePayloadMap& t)
     : updates_source(u), types(t) {}
 
 SyncSourceInfo::~SyncSourceInfo() {}
@@ -27,7 +27,7 @@ DictionaryValue* SyncSourceInfo::ToValue() const {
   DictionaryValue* value = new DictionaryValue();
   value->SetString("updatesSource",
                    GetUpdatesSourceString(updates_source));
-  value->Set("types", syncer::ModelTypePayloadMapToValue(types));
+  value->Set("types", ModelTypePayloadMapToValue(types));
   return value;
 }
 
diff --git a/sync/internal_api/public/sessions/sync_source_info.h b/sync/internal_api/public/sessions/sync_source_info.h
index 4e5b264..390bdb5 100644
--- a/sync/internal_api/public/sessions/sync_source_info.h
+++ b/sync/internal_api/public/sessions/sync_source_info.h
@@ -22,17 +22,17 @@ namespace sessions {
 // specific payloads which should be sent to the server.
 struct SyncSourceInfo {
   SyncSourceInfo();
-  explicit SyncSourceInfo(const syncer::ModelTypePayloadMap& t);
+  explicit SyncSourceInfo(const ModelTypePayloadMap& t);
   SyncSourceInfo(
       const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u,
-      const syncer::ModelTypePayloadMap& t);
+      const ModelTypePayloadMap& t);
   ~SyncSourceInfo();
 
   // Caller takes ownership of the returned dictionary.
   base::DictionaryValue* ToValue() const;
 
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source;
-  syncer::ModelTypePayloadMap types;
+  ModelTypePayloadMap types;
 };
 
 }  // namespace sessions