| Index: components/sync/engine_impl/get_updates_processor_unittest.cc
|
| diff --git a/components/sync/engine_impl/get_updates_processor_unittest.cc b/components/sync/engine_impl/get_updates_processor_unittest.cc
|
| index 0cffc585897ae44adaaef82088b237ecf5541318..03b7b9687fa907ccbf4abd349d81a37403a3fb0d 100644
|
| --- a/components/sync/engine_impl/get_updates_processor_unittest.cc
|
| +++ b/components/sync/engine_impl/get_updates_processor_unittest.cc
|
| @@ -6,8 +6,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| @@ -113,7 +115,7 @@ TEST_F(GetUpdatesProcessorTest, BookmarkNudge) {
|
| gu_msg.caller_info().source());
|
| EXPECT_EQ(sync_pb::SyncEnums::GU_TRIGGER, gu_msg.get_updates_origin());
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
|
|
| const sync_pb::DataTypeProgressMarker& progress_marker =
|
| @@ -161,7 +163,7 @@ TEST_F(GetUpdatesProcessorTest, NotifyMany) {
|
| gu_msg.caller_info().source());
|
| EXPECT_EQ(sync_pb::SyncEnums::GU_TRIGGER, gu_msg.get_updates_origin());
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
|
|
| const sync_pb::DataTypeProgressMarker& progress_marker =
|
| @@ -201,7 +203,7 @@ TEST_F(GetUpdatesProcessorTest, InitialSyncRequest) {
|
| gu_msg.caller_info().source());
|
| EXPECT_EQ(sync_pb::SyncEnums::GU_TRIGGER, gu_msg.get_updates_origin());
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
|
|
| const sync_pb::DataTypeProgressMarker& progress_marker =
|
| @@ -235,7 +237,7 @@ TEST_F(GetUpdatesProcessorTest, ConfigureTest) {
|
|
|
| ModelTypeSet progress_types;
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
| progress_types.Put(type);
|
| }
|
| @@ -256,7 +258,7 @@ TEST_F(GetUpdatesProcessorTest, PollTest) {
|
|
|
| ModelTypeSet progress_types;
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
| progress_types.Put(type);
|
| }
|
| @@ -287,7 +289,7 @@ TEST_F(GetUpdatesProcessorTest, RetryTest) {
|
|
|
| ModelTypeSet progress_types;
|
| for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
|
| - syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| + ModelType type = GetModelTypeFromSpecificsFieldNumber(
|
| gu_msg.from_progress_marker(i).data_type_id());
|
| progress_types.Put(type);
|
| }
|
|
|