Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4211c657f6090b9b4be30fe9ca90db97455bf576..43d7d341f575ac2a7b075cccaa96cf13fd173c9a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1657,8 +1657,8 @@
         'browser/sync/abstract_profile_sync_service_test.cc',
         'browser/sync/abstract_profile_sync_service_test.h',
         'browser/sync/backend_migrator_unittest.cc',
-        'browser/sync/engine/read_node_mock.cc',
-        'browser/sync/engine/read_node_mock.h',
+        'browser/sync/internal_api/read_node_mock.cc',
+        'browser/sync/internal_api/read_node_mock.h',
         'browser/sync/glue/autofill_data_type_controller_unittest.cc',
         'browser/sync/glue/autofill_model_associator_unittest.cc',
         'browser/sync/glue/autofill_profile_model_associator_unittest.cc',
@@ -3137,14 +3137,14 @@
         'browser/sync/engine/mock_model_safe_workers.h',
         'browser/sync/engine/nigori_util_unittest.cc',
         'browser/sync/engine/process_commit_response_command_unittest.cc',
-        'browser/sync/engine/syncapi_unittest.cc',
         'browser/sync/engine/syncer_proto_util_unittest.cc',
         'browser/sync/engine/sync_scheduler_unittest.cc',
         'browser/sync/engine/sync_scheduler_whitebox_unittest.cc',
         'browser/sync/engine/syncer_unittest.cc',
         'browser/sync/engine/syncproto_unittest.cc',
-        'browser/sync/engine/syncapi_mock.h',
         'browser/sync/engine/verify_updates_command_unittest.cc',
+        'browser/sync/internal_api/syncapi_mock.h',
+        'browser/sync/internal_api/syncapi_unittest.cc',
         'browser/sync/js/js_arg_list_unittest.cc',
         'browser/sync/js/js_event_details_unittest.cc',
         'browser/sync/js/js_sync_manager_observer_unittest.cc',