Fix remaining incompatibilities between scoped_ptr and unique_ptr.

sync/engine/non_blocking_type_commit_contribution.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/non_blocking_type_commit_contribution.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 44 matching lines @@
   CommitResponseDataList response_list;
 
   for (size_t i = 0; i < sequence_numbers_.size(); ++i) {
     const sync_pb::CommitResponse_EntryResponse& entry_response =
         commit_response.entryresponse(entries_start_index_ + i);
 
     switch (entry_response.response_type()) {
       case sync_pb::CommitResponse::INVALID_MESSAGE:
         LOG(ERROR) << "Server reports commit message is invalid.";
         DLOG(ERROR) << "Message was: "
-                    << syncer::SyncEntityToValue(entities_.Get(i), false);
+                    << syncer::SyncEntityToValue(entities_.Get(i), false).get();

[dcheng, 2016/01/19 23:50:55]

This seems pretty silly: we log out a pointer value that's going to be
immediately deleted...

         unknown_error = true;
         break;
       case sync_pb::CommitResponse::CONFLICT:
         DVLOG(1) << "Server reports conflict for commit message.";
         DVLOG(1) << "Message was: "
-                 << syncer::SyncEntityToValue(entities_.Get(i), false);
+                 << syncer::SyncEntityToValue(entities_.Get(i), false).get();
         commit_conflict = true;
         break;
       case sync_pb::CommitResponse::SUCCESS: {
         CommitResponseData response_data;
         response_data.id = entry_response.id_string();
         response_data.client_tag_hash =
             entities_.Get(i).client_defined_unique_tag();
         response_data.sequence_number = sequence_numbers_[i];
         response_data.response_version = entry_response.version();
         response_list.push_back(response_data);
@@ skipping 33 matching lines @@
   // We could inform our parent NonBlockingCommitContributor that a commit is
   // no longer in progress.  The current implementation doesn't really care
   // either way, so we don't bother sending the signal.
 }
 
 size_t NonBlockingTypeCommitContribution::GetNumEntries() const {
   return sequence_numbers_.size();
 }
 
 }  // namespace syncer_v2