[Sync] //components/sync manual changes [DO NOT SUBMIT]

components/sync/test/local_sync_test_server.cc

Index: components/sync/test/local_sync_test_server.cc
diff --git a/components/sync/test/local_sync_test_server.cc b/components/sync/test/local_sync_test_server.cc
index 87ff5d4ee8bdd0046abe5212e3c343de3fdf6424..4dd1bfd09a9c63a7439ea9b362c60200eedc87df 100644
--- a/components/sync/test/local_sync_test_server.cc
+++ b/components/sync/test/local_sync_test_server.cc
@@ -53,7 +53,8 @@ bool LocalSyncTestServer::GetTestServerPath(
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
-  testserver_dir = testserver_dir.Append(FILE_PATH_LITERAL("sync"))
+  testserver_dir = testserver_dir.Append(FILE_PATH_LITERAL("components"))
+                       .Append(FILE_PATH_LITERAL("sync"))
                        .Append(FILE_PATH_LITERAL("tools"))
                        .Append(FILE_PATH_LITERAL("testserver"));
 
@@ -92,7 +93,9 @@ bool LocalSyncTestServer::SetPythonPath() const {
                  << "Testserver features that rely on it will not work";
     return true;
   }
-  AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
+  AppendToPythonPath(pyproto_dir.AppendASCII("components")
+                         .AppendASCII("sync")
+                         .AppendASCII("protocol"));
   return true;
 }