| Index: sync/tools/testserver/run_sync_testserver.cc
|
| diff --git a/sync/tools/testserver/run_sync_testserver.cc b/sync/tools/testserver/run_sync_testserver.cc
|
| index 2057db2295c416b1917e7e097916450fc77de7bf..8ffa61ac898ef7d00f8eb0f0b70a9dd20638613f 100644
|
| --- a/sync/tools/testserver/run_sync_testserver.cc
|
| +++ b/sync/tools/testserver/run_sync_testserver.cc
|
| @@ -24,7 +24,7 @@ static void PrintUsage() {
|
| // the sync HTTP and XMPP sever functionality respectively.
|
| static bool RunSyncTest(
|
| const base::FilePath::StringType& sync_test_script_name) {
|
| - scoped_ptr<syncer::LocalSyncTestServer> test_server(
|
| + std::unique_ptr<syncer::LocalSyncTestServer> test_server(
|
| new syncer::LocalSyncTestServer());
|
| if (!test_server->SetPythonPath()) {
|
| LOG(ERROR) << "Error trying to set python path. Exiting.";
|
| @@ -106,7 +106,7 @@ int main(int argc, const char* argv[]) {
|
| uint16_t xmpp_port = 0;
|
| GetPortFromSwitch("xmpp-port", &xmpp_port);
|
|
|
| - scoped_ptr<syncer::LocalSyncTestServer> test_server(
|
| + std::unique_ptr<syncer::LocalSyncTestServer> test_server(
|
| new syncer::LocalSyncTestServer(port, xmpp_port));
|
| if (!test_server->Start()) {
|
| printf("Error: failed to start python sync test server. Exiting.\n");
|
|
|