Index: components/sync/test/fake_server/fake_server_verifier.cc |
diff --git a/sync/test/fake_server/fake_server_verifier.cc b/components/sync/test/fake_server/fake_server_verifier.cc |
similarity index 92% |
rename from sync/test/fake_server/fake_server_verifier.cc |
rename to components/sync/test/fake_server/fake_server_verifier.cc |
index 20b71926cbc9db0c58c03418bdea9f4911427b03..48245f06caabe51e75007f769d5b68c4b6bf613c 100644 |
--- a/sync/test/fake_server/fake_server_verifier.cc |
+++ b/components/sync/test/fake_server/fake_server_verifier.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "sync/test/fake_server/fake_server_verifier.h" |
+#include "components/sync/test/fake_server/fake_server_verifier.h" |
#include <stddef.h> |
@@ -13,9 +13,9 @@ |
#include "base/json/json_writer.h" |
#include "base/values.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/test/fake_server/fake_server.h" |
-#include "sync/test/fake_server/sessions_hierarchy.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/test/fake_server/fake_server.h" |
+#include "components/sync/test/fake_server/sessions_hierarchy.h" |
#include "testing/gtest/include/gtest/gtest.h" |
using base::JSONWriter; |
@@ -69,7 +69,7 @@ string ConvertFakeServerContentsToString( |
} // namespace |
FakeServerVerifier::FakeServerVerifier(FakeServer* fake_server) |
- : fake_server_(fake_server) { } |
+ : fake_server_(fake_server) {} |
FakeServerVerifier::~FakeServerVerifier() {} |
@@ -86,11 +86,11 @@ AssertionResult FakeServerVerifier::VerifyEntityCountByType( |
base::ListValue* entity_list = NULL; |
if (!entities->GetList(model_type_string, &entity_list)) { |
return UnknownTypeAssertionFailure(model_type_string); |
- } else if (expected_count != entity_list->GetSize()) { |
+ } else if (expected_count != entity_list->GetSize()) { |
return VerificationCountAssertionFailure(entity_list->GetSize(), |
expected_count) |
- << "\n\n" |
- << ConvertFakeServerContentsToString(*entities); |
+ << "\n\n" |
+ << ConvertFakeServerContentsToString(*entities); |
} |
return AssertionSuccess(); |
@@ -121,10 +121,8 @@ AssertionResult FakeServerVerifier::VerifyEntityCountByTypeAndName( |
return UnknownTypeAssertionFailure(model_type_string); |
} else if (actual_count != expected_count) { |
return VerificationCountAssertionFailure(actual_count, expected_count) |
- << "; Name: " |
- << name |
- << "\n\n" |
- << ConvertFakeServerContentsToString(*entities); |
+ << "; Name: " << name << "\n\n" |
+ << ConvertFakeServerContentsToString(*entities); |
} |
return AssertionSuccess(); |