Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: sync/engine/syncer_proto_util_unittest.cc

Issue 10735041: Remove syncproto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/engine/syncer_proto_util_unittest.cc
diff --git a/sync/engine/syncer_proto_util_unittest.cc b/sync/engine/syncer_proto_util_unittest.cc
index 107dd55425d7baab27a03af6a53bd93084dd87f4..21735d8b88a6899e70459e83123c30cc14673419 100644
--- a/sync/engine/syncer_proto_util_unittest.cc
+++ b/sync/engine/syncer_proto_util_unittest.cc
@@ -10,7 +10,6 @@
#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"
@@ -27,6 +26,10 @@
using ::testing::_;
+using sync_pb::ClientToServerMessage;
+using sync_pb::CommitResponse_EntryResponse;
+using sync_pb::SyncEntity;
+
namespace syncer {
using sessions::SyncSessionContext;
@@ -172,7 +175,7 @@ class SyncerProtoUtilTest : public testing::Test {
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
@@ -219,7 +222,7 @@ class DummyConnectionManager : public syncer::ServerConnectionManager {
return false;
}
- ClientToServerResponse response;
+ sync_pb::ClientToServerResponse response;
if (access_denied_) {
response.set_error_code(sync_pb::SyncEnums::ACCESS_DENIED);
}
@@ -244,9 +247,10 @@ class DummyConnectionManager : public syncer::ServerConnectionManager {
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,

Powered by Google App Engine
This is Rietveld 408576698