Remove syncproto.h

sync/test/engine/mock_connection_manager.cc

 // 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 regression tests.
 
 #include "sync/test/engine/mock_connection_manager.h"
 
 #include <map>
 
 #include "base/location.h"
 #include "base/stringprintf.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/test/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::map;
 using std::string;
+using sync_pb::ClientToServerMessage;
 using sync_pb::CommitMessage;
 using sync_pb::CommitResponse;
 using sync_pb::GetUpdatesMessage;
 using sync_pb::SyncEnums;
 
 namespace syncer {
 
 using syncable::WriteTransaction;
 
 static char kValidAuthToken[] = "AuthToken";
@@ skipping 42 matching lines @@
 
 bool MockConnectionManager::PostBufferToPath(PostBufferParams* params,
     const string& path,
     const string& auth_token,
     syncer::ScopedServerStatusWatcher* watcher) {
   ClientToServerMessage post;
   CHECK(post.ParseFromString(params->buffer_in));
   CHECK(post.has_protocol_version());
   last_request_.CopyFrom(post);
   client_stuck_ = post.sync_problem_detected();
-  ClientToServerResponse response;
+  sync_pb::ClientToServerResponse response;
   response.Clear();
 
   if (directory_) {
     // If the Directory's locked when we do this, it's a problem as in normal
     // use this function could take a while to return because it accesses the
     // network. As we can't test this we do the next best thing and hang here
     // when there's an issue.
     CHECK(directory_->good());
     WriteTransaction wt(FROM_HERE, syncable::UNITTEST, directory_);
   }
@@ skipping 493 matching lines @@
 
 void MockConnectionManager::UpdateConnectionStatus() {
   if (!server_reachable_) {
     server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   } else {
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
 }  // namespace syncer