Remove syncproto.h

sync/engine/syncer_proto_util_unittest.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.
 
 #include "sync/engine/syncer_proto_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "sync/engine/syncproto.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/sync_enums.pb.h"
 #include "sync/sessions/session_state.h"
 #include "sync/sessions/sync_session_context.h"
 #include "sync/syncable/blob.h"
 #include "sync/syncable/directory.h"
 #include "sync/test/engine/mock_connection_manager.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
+using sync_pb::ClientToServerMessage;
+using sync_pb::CommitResponse_EntryResponse;
+using sync_pb::SyncEntity;
+
 namespace syncer {
 
 using sessions::SyncSessionContext;
 using syncable::Blob;
 
 class MockDelegate : public sessions::SyncSession::Delegate {
  public:
    MockDelegate() {}
    ~MockDelegate() {}
 
@@ skipping 125 matching lines @@
   }
 
  protected:
   MessageLoop message_loop_;
   TestDirectorySetterUpper dir_maker_;
 };
 
 TEST_F(SyncerProtoUtilTest, VerifyResponseBirthday) {
   // Both sides empty
   EXPECT_TRUE(directory()->store_birthday().empty());
-  ClientToServerResponse response;
+  sync_pb::ClientToServerResponse response;
   EXPECT_FALSE(SyncerProtoUtil::VerifyResponseBirthday(directory(), &response));
 
   // Remote set, local empty
   response.set_store_birthday("flan");
   EXPECT_TRUE(SyncerProtoUtil::VerifyResponseBirthday(directory(), &response));
   EXPECT_EQ(directory()->store_birthday(), "flan");
 
   // Remote empty, local set.
   response.clear_store_birthday();
   EXPECT_TRUE(SyncerProtoUtil::VerifyResponseBirthday(directory(), &response));
@@ skipping 26 matching lines @@
         access_denied_(false) {}
 
   virtual ~DummyConnectionManager() {}
   virtual bool PostBufferWithCachedAuth(
       PostBufferParams* params,
       ScopedServerStatusWatcher* watcher) OVERRIDE {
     if (send_error_) {
       return false;
     }
 
-    ClientToServerResponse response;
+    sync_pb::ClientToServerResponse response;
     if (access_denied_) {
       response.set_error_code(sync_pb::SyncEnums::ACCESS_DENIED);
     }
     response.SerializeToString(&params->buffer_out);
 
     return true;
   }
 
   void set_send_error(bool send) {
     send_error_ = send;
   }
 
   void set_access_denied(bool denied) {
     access_denied_ = denied;
   }
 
  private:
   bool send_error_;
   bool access_denied_;
 };
 
 TEST_F(SyncerProtoUtilTest, PostAndProcessHeaders) {
   DummyConnectionManager dcm;
   ClientToServerMessage msg;
+  SyncerProtoUtil::SetProtocolVersion(&msg);
   msg.set_share("required");
   msg.set_message_contents(ClientToServerMessage::GET_UPDATES);
-  ClientToServerResponse response;
+  sync_pb::ClientToServerResponse response;
 
   dcm.set_send_error(true);
   EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
       msg, &response));
 
   dcm.set_send_error(false);
   EXPECT_TRUE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL,
       msg, &response));
 
   dcm.set_access_denied(true);
@@ skipping 22 matching lines @@
   error.error_type = syncer::THROTTLED;
 
   base::TimeTicks ticks = base::TimeTicks::FromInternalValue(1);
 
   EXPECT_CALL(delegate, OnSilencedUntil(ticks));
 
   SyncerProtoUtil::HandleThrottleError(error, ticks, &tracker, &delegate);
   EXPECT_TRUE(tracker.GetThrottledTypes().Empty());
 }
 }  // namespace syncer