Convert JsonWriter::Write to taking a const ref for the in-param

Clearer API; flushes out a lot of unnecessary heap allocations.

depends on https://codereview.chromium.org/1129083003/

BUG=none

Review URL: https://codereview.chromium.org/1131113004

Cr-Commit-Position: refs/heads/master@{#330255}

8 files changed, 12 insertions, 18 deletions

diff --git a/sync/api/sync_data.cc b/sync/api/sync_data.cc
index 0dd567d..d6c9152 100644
--- a/sync/api/sync_data.cc
+++ b/sync/api/sync_data.cc
@@ -155,10 +155,9 @@ std::string SyncData::ToString() const {
 
   std::string type = ModelTypeToString(GetDataType());
   std::string specifics;
-  scoped_ptr<base::DictionaryValue> value(
-      EntitySpecificsToValue(GetSpecifics()));
-  base::JSONWriter::WriteWithOptions(
-      value.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &specifics);
+  base::JSONWriter::WriteWithOptions(*EntitySpecificsToValue(GetSpecifics()),
+                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                     &specifics);
 
   if (IsLocal()) {
     SyncDataLocal sync_data_local(*this);
diff --git a/sync/engine/traffic_logger.cc b/sync/engine/traffic_logger.cc
index bc285bd..1e9a6bc 100644
--- a/sync/engine/traffic_logger.cc
+++ b/sync/engine/traffic_logger.cc
@@ -25,9 +25,8 @@ void LogData(const T& data,
     scoped_ptr<base::DictionaryValue> value =
         (*to_dictionary_value)(data, true /* include_specifics */);
     std::string message;
-    base::JSONWriter::WriteWithOptions(value.get(),
-        base::JSONWriter::OPTIONS_PRETTY_PRINT,
-        &message);
+    base::JSONWriter::WriteWithOptions(
+        *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &message);
     DVLOG(1) << "\n" << description << "\n" << message << "\n";
   }
 }
diff --git a/sync/internal_api/public/engine/model_safe_worker.cc b/sync/internal_api/public/engine/model_safe_worker.cc
index 9692a78..f054e50 100644
--- a/sync/internal_api/public/engine/model_safe_worker.cc
+++ b/sync/internal_api/public/engine/model_safe_worker.cc
@@ -24,10 +24,8 @@ scoped_ptr<base::DictionaryValue> ModelSafeRoutingInfoToValue(
 
 std::string ModelSafeRoutingInfoToString(
     const ModelSafeRoutingInfo& routing_info) {
-  scoped_ptr<base::DictionaryValue> dict =
-      ModelSafeRoutingInfoToValue(routing_info);
   std::string json;
-  base::JSONWriter::Write(dict.get(), &json);
+  base::JSONWriter::Write(*ModelSafeRoutingInfoToValue(routing_info), &json);
   return json;
 }
 
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index dcb3f73..9614330 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -105,7 +105,7 @@ scoped_ptr<base::DictionaryValue> SyncSessionSnapshot::ToValue() const {
 std::string SyncSessionSnapshot::ToString() const {
   std::string json;
   base::JSONWriter::WriteWithOptions(
-      ToValue().get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
+      *ToValue(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
   return json;
 }
 
diff --git a/sync/js/js_event_details.cc b/sync/js/js_event_details.cc
index 0517b39..d430632 100644
--- a/sync/js/js_event_details.cc
+++ b/sync/js/js_event_details.cc
@@ -21,7 +21,7 @@ const base::DictionaryValue& JsEventDetails::Get() const {
 
 std::string JsEventDetails::ToString() const {
   std::string str;
-  base::JSONWriter::Write(&Get(), &str);
+  base::JSONWriter::Write(Get(), &str);
   return str;
 }
 
diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc
index 1eb9227..1ad5095 100644
--- a/sync/syncable/nigori_util.cc
+++ b/sync/syncable/nigori_util.cc
@@ -175,9 +175,8 @@ bool UpdateEntryWithEncryption(
     if (VLOG_IS_ON(2)) {
       scoped_ptr<base::DictionaryValue> value(entry->ToValue(NULL));
       std::string info;
-      base::JSONWriter::WriteWithOptions(value.get(),
-                                         base::JSONWriter::OPTIONS_PRETTY_PRINT,
-                                         &info);
+      base::JSONWriter::WriteWithOptions(
+          *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &info);
       DVLOG(2) << "Encrypting specifics of type "
                << ModelTypeToString(type)
                << " with content: "
diff --git a/sync/test/fake_server/fake_server_verifier.cc b/sync/test/fake_server/fake_server_verifier.cc
index bc64550..b968d0f 100644
--- a/sync/test/fake_server/fake_server_verifier.cc
+++ b/sync/test/fake_server/fake_server_verifier.cc
@@ -53,8 +53,7 @@ AssertionResult VerifySessionsHierarchyEquality(
 string ConvertFakeServerContentsToString(
     const base::DictionaryValue& entities) {
   string entities_str;
-  if (!JSONWriter::WriteWithOptions(&entities,
-                                    JSONWriter::OPTIONS_PRETTY_PRINT,
+  if (!JSONWriter::WriteWithOptions(entities, JSONWriter::OPTIONS_PRETTY_PRINT,
                                     &entities_str)) {
     entities_str = "Could not convert FakeServer contents to string.";
   }
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 8422d2e..1106460 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -122,7 +122,7 @@ class NullEncryptor : public Encryptor {
 
 std::string ValueToString(const base::Value& value) {
   std::string str;
-  base::JSONWriter::Write(&value, &str);
+  base::JSONWriter::Write(value, &str);
   return str;
 }