Remove syncproto.h

sync/sessions/status_controller.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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
@@ skipping 56 matching lines @@
   UpdateProgress* GetUnrestrictedMutableUpdateProgressForTest(
       ModelSafeGroup group);
 
   // ClientToServer messages.
   const syncer::ModelTypeSet updates_request_types() const {
     return model_neutral_.updates_request_types;
   }
   void set_updates_request_types(syncer::ModelTypeSet value) {
     model_neutral_.updates_request_types = value;
   }
-  const ClientToServerResponse& updates_response() const {
+  const sync_pb::ClientToServerResponse& updates_response() const {
     return model_neutral_.updates_response;
   }
-  ClientToServerResponse* mutable_updates_response() {
+  sync_pb::ClientToServerResponse* mutable_updates_response() {
     return &model_neutral_.updates_response;
   }
 
   // Changelog related state.
   int64 num_server_changes_remaining() const {
     return model_neutral_.num_server_changes_remaining;
   }
 
   const OrderedCommitSet::Projection& commit_id_projection(
       const sessions::OrderedCommitSet &commit_set) {
@@ skipping 140 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_STATUS_CONTROLLER_H_