Remove syncproto.h

sync/engine/verify_updates_command_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 "base/location.h"
 #include "sync/engine/verify_updates_command.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/sessions/session_state.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/mutable_entry.h"
@@ skipping 34 matching lines @@
 
     entry.Put(syncable::BASE_VERSION, 1);
     entry.Put(syncable::SERVER_VERSION, 1);
     entry.Put(syncable::NON_UNIQUE_NAME, item_id);
     entry.Put(syncable::PARENT_ID, Id::CreateFromServerId(parent_id));
     sync_pb::EntitySpecifics default_specifics;
     AddDefaultFieldValue(type, &default_specifics);
     entry.Put(syncable::SERVER_SPECIFICS, default_specifics);
   }
 
-  void AddUpdate(GetUpdatesResponse* updates,
+  void AddUpdate(sync_pb::GetUpdatesResponse* updates,
       const std::string& id, const std::string& parent,
       const syncer::ModelType& type) {
     sync_pb::SyncEntity* e = updates->add_entries();
     e->set_id_string("b1");
     e->set_parent_id_string(parent);
     e->set_non_unique_name("b1");
     e->set_name("b1");
     AddDefaultFieldValue(type, e->mutable_specifics());
   }
 
   VerifyUpdatesCommand command_;
 
 };
 
 TEST_F(VerifyUpdatesCommandTest, AllVerified) {
   string root = syncable::GetNullId().GetServerId();
 
   CreateLocalItem("b1", root, syncer::BOOKMARKS);
   CreateLocalItem("b2", root, syncer::BOOKMARKS);
   CreateLocalItem("p1", root, syncer::PREFERENCES);
   CreateLocalItem("a1", root, syncer::AUTOFILL);
 
   ExpectNoGroupsToChange(command_);
 
-  GetUpdatesResponse* updates = session()->mutable_status_controller()->
+  sync_pb::GetUpdatesResponse* updates =
+      session()->mutable_status_controller()->
       mutable_updates_response()->mutable_get_updates();
   AddUpdate(updates, "b1", root, syncer::BOOKMARKS);
   AddUpdate(updates, "b2", root, syncer::BOOKMARKS);
   AddUpdate(updates, "p1", root, syncer::PREFERENCES);
   AddUpdate(updates, "a1", root, syncer::AUTOFILL);
 
   ExpectGroupsToChange(command_, GROUP_UI, GROUP_DB);
 
   command_.ExecuteImpl(session());
 
   StatusController* status = session()->mutable_status_controller();
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_UI);
     ASSERT_TRUE(status->update_progress());
     EXPECT_EQ(3, status->update_progress()->VerifiedUpdatesSize());
   }
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_DB);
     ASSERT_TRUE(status->update_progress());
     EXPECT_EQ(1, status->update_progress()->VerifiedUpdatesSize());
   }
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
     EXPECT_FALSE(status->update_progress());
   }
 }
 
 }  // namespace syncer