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

sync/test/engine/mock_connection_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Mock ServerConnectionManager class for use in client unit tests.
 
 #ifndef SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <bitset>
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "sync/engine/net/server_connection_manager.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base/model_type_payload_map.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
-class MockConnectionManager : public syncer::ServerConnectionManager {
+class MockConnectionManager : public ServerConnectionManager {
  public:
   class MidCommitObserver {
    public:
     virtual void Observe() = 0;
 
    protected:
     virtual ~MidCommitObserver() {}
   };
 
   explicit MockConnectionManager(syncable::Directory*);
   virtual ~MockConnectionManager();
 
   // Overridden ServerConnectionManager functions.
   virtual bool PostBufferToPath(
       PostBufferParams*,
       const std::string& path,
       const std::string& auth_token,
-      syncer::ScopedServerStatusWatcher* watcher) OVERRIDE;
+      ScopedServerStatusWatcher* watcher) OVERRIDE;
 
   // Control of commit response.
   // NOTE: Commit callback is invoked only once then reset.
   void SetMidCommitCallback(const base::Closure& callback);
   void SetMidCommitObserver(MidCommitObserver* observer);
 
   // Set this if you want commit to perform commit time rename. Will request
   // that the client renames all commited entries, prepending this string.
   void SetCommitTimeRename(std::string prepend);
 
@@ skipping 121 matching lines @@
   // verify that a GetUpdates actually did or did not happen after running
   // the syncer.
   int GetAndClearNumGetUpdatesRequests() {
     int result = num_get_updates_requests_;
     num_get_updates_requests_ = 0;
     return result;
   }
 
   // Expect that GetUpdates will request exactly the types indicated in
   // the bitset.
-  void ExpectGetUpdatesRequestTypes(
-      syncer::ModelTypeSet expected_filter) {
+  void ExpectGetUpdatesRequestTypes(ModelTypeSet expected_filter) {
     expected_filter_ = expected_filter;
   }
 
-  void ExpectGetUpdatesRequestPayloads(
-      const syncer::ModelTypePayloadMap& payloads) {
+  void ExpectGetUpdatesRequestPayloads(const ModelTypePayloadMap& payloads) {
     expected_payloads_ = payloads;
   }
 
   void SetServerReachable();
 
   void SetServerNotReachable();
 
   // Updates our internal state as if we had attempted a connection.  Does not
   // send notifications as a real connection attempt would.  This is useful in
   // cases where we're mocking out most of the code that performs network
@@ skipping 50 matching lines @@
   // client.
   sync_pb::GetUpdatesResponse* GetUpdateResponse();
   void ApplyToken();
 
   // Determine whether an progress marker array (like that sent in
   // GetUpdates.from_progress_marker) indicates that a particular ModelType
   // should be included.
   bool IsModelTypePresentInSpecifics(
       const google::protobuf::RepeatedPtrField<
           sync_pb::DataTypeProgressMarker>& filter,
-      syncer::ModelType value);
+      ModelType value);
 
   sync_pb::DataTypeProgressMarker const* GetProgressMarkerForType(
       const google::protobuf::RepeatedPtrField<
           sync_pb::DataTypeProgressMarker>& filter,
-      syncer::ModelType value);
+      ModelType value);
 
   // When false, we pretend to have network connectivity issues.
   bool server_reachable_;
 
   // All IDs that have been committed.
   std::vector<syncable::Id> committed_ids_;
 
   // Control of when/if we return conflicts.
   bool conflict_all_commits_;
   int conflict_n_commits_;
@@ skipping 51 matching lines @@
   scoped_ptr<sync_pb::ClientCommand> client_command_;
 
   // The next value to use for the position_in_parent property.
   int64 next_position_in_parent_;
 
   // The default is to use the newer sync_pb::BookmarkSpecifics-style protocol.
   // If this option is set to true, then the MockConnectionManager will
   // use the older sync_pb::SyncEntity_BookmarkData-style protocol.
   bool use_legacy_bookmarks_protocol_;
 
-  syncer::ModelTypeSet expected_filter_;
+  ModelTypeSet expected_filter_;
 
-  syncer::ModelTypePayloadMap expected_payloads_;
+  ModelTypePayloadMap expected_payloads_;
 
   int num_get_updates_requests_;
 
   std::string next_token_;
 
   sync_pb::ClientToServerMessage last_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_