Index: components/sync/syncable/model_type_unittest.cc |
diff --git a/sync/syncable/model_type_unittest.cc b/components/sync/syncable/model_type_unittest.cc |
similarity index 95% |
rename from sync/syncable/model_type_unittest.cc |
rename to components/sync/syncable/model_type_unittest.cc |
index c0786fa5a2056c7b51b79b905c05137cc49a16dc..3db962356d72b46d483f7b188ddca8c7201e9ea3 100644 |
--- a/sync/syncable/model_type_unittest.cc |
+++ b/components/sync/syncable/model_type_unittest.cc |
@@ -8,8 +8,8 @@ |
#include "base/strings/string_util.h" |
#include "base/test/values_test_util.h" |
#include "base/values.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/protocol/sync.pb.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/protocol/sync.pb.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace syncer { |
@@ -25,8 +25,7 @@ TEST_F(ModelTypeTest, ModelTypeToValue) { |
} |
base::ExpectStringValue("Top-level folder", |
ModelTypeToValue(TOP_LEVEL_FOLDER)); |
- base::ExpectStringValue("Unspecified", |
- ModelTypeToValue(UNSPECIFIED)); |
+ base::ExpectStringValue("Unspecified", ModelTypeToValue(UNSPECIFIED)); |
} |
TEST_F(ModelTypeTest, ModelTypeFromValue) { |
@@ -85,8 +84,7 @@ TEST_F(ModelTypeTest, ModelTypeToFromSpecificsFieldNumber) { |
for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good(); |
iter.Inc()) { |
int field_number = GetSpecificsFieldNumberFromModelType(iter.Get()); |
- EXPECT_EQ(iter.Get(), |
- GetModelTypeFromSpecificsFieldNumber(field_number)); |
+ EXPECT_EQ(iter.Get(), GetModelTypeFromSpecificsFieldNumber(field_number)); |
} |
} |