diff options
95 files changed, 296 insertions, 250 deletions
diff --git a/base/json/json_string_value_serializer.cc b/base/json/json_string_value_serializer.cc index 94e660e..3045fa5 100644 --- a/base/json/json_string_value_serializer.cc +++ b/base/json/json_string_value_serializer.cc @@ -24,11 +24,13 @@ bool JSONStringValueSerializer::SerializeInternal(const Value& root, if (!json_string_ || initialized_with_const_string_) return false; - base::JSONWriter::WriteWithOptions( - &root, - pretty_print_, - omit_binary_values ? base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES : 0, - json_string_); + int options = 0; + if (omit_binary_values) + options |= base::JSONWriter::OPTIONS_OMIT_BINARY_VALUES; + if (pretty_print_) + options |= base::JSONWriter::OPTIONS_PRETTY_PRINT; + + base::JSONWriter::WriteWithOptions(&root, options, json_string_); return true; } @@ -42,4 +44,3 @@ Value* JSONStringValueSerializer::Deserialize(int* error_code, error_code, error_str); } - diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc index 27300c0..e814003 100644 --- a/base/json/json_writer.cc +++ b/base/json/json_writer.cc @@ -25,42 +25,43 @@ static const char kPrettyPrintLineEnding[] = "\n"; const char* JSONWriter::kEmptyArray = "[]"; /* static */ -void JSONWriter::Write(const Value* const node, - bool pretty_print, - std::string* json) { - WriteWithOptions(node, pretty_print, 0, json); +void JSONWriter::Write(const Value* const node, std::string* json) { + WriteWithOptions(node, 0, json); } /* static */ -void JSONWriter::WriteWithOptions(const Value* const node, - bool pretty_print, - int options, +void JSONWriter::WriteWithOptions(const Value* const node, int options, std::string* json) { json->clear(); // Is there a better way to estimate the size of the output? json->reserve(1024); - JSONWriter writer(pretty_print, json); + bool escape = !(options & OPTIONS_DO_NOT_ESCAPE); bool omit_binary_values = !!(options & OPTIONS_OMIT_BINARY_VALUES); bool omit_double_type_preservation = !!(options & OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION); - writer.BuildJSONString(node, 0, escape, omit_binary_values, - omit_double_type_preservation); + bool pretty_print = !!(options & OPTIONS_PRETTY_PRINT); + + JSONWriter writer(escape, omit_binary_values, omit_double_type_preservation, + pretty_print, json); + writer.BuildJSONString(node, 0); + if (pretty_print) json->append(kPrettyPrintLineEnding); } -JSONWriter::JSONWriter(bool pretty_print, std::string* json) - : json_string_(json), - pretty_print_(pretty_print) { +JSONWriter::JSONWriter(bool escape, bool omit_binary_values, + bool omit_double_type_preservation, bool pretty_print, + std::string* json) + : escape_(escape), + omit_binary_values_(omit_binary_values), + omit_double_type_preservation_(omit_double_type_preservation), + pretty_print_(pretty_print), + json_string_(json) { DCHECK(json); } -void JSONWriter::BuildJSONString(const Value* const node, - int depth, - bool escape, - bool omit_binary_values, - bool omit_double_type_preservation) { +void JSONWriter::BuildJSONString(const Value* const node, int depth) { switch (node->GetType()) { case Value::TYPE_NULL: json_string_->append("null"); @@ -89,7 +90,7 @@ void JSONWriter::BuildJSONString(const Value* const node, double value; bool result = node->GetAsDouble(&value); DCHECK(result); - if (omit_double_type_preservation && + if (omit_double_type_preservation_ && value <= kint64max && value >= kint64min && std::floor(value) == value) { @@ -122,7 +123,7 @@ void JSONWriter::BuildJSONString(const Value* const node, std::string value; bool result = node->GetAsString(&value); DCHECK(result); - if (escape) { + if (escape_) { JsonDoubleQuote(UTF8ToUTF16(value), true, json_string_); } else { JsonDoubleQuote(value, true, json_string_); @@ -142,7 +143,7 @@ void JSONWriter::BuildJSONString(const Value* const node, bool result = list->Get(i, &value); DCHECK(result); - if (omit_binary_values && value->GetType() == Value::TYPE_BINARY) { + if (omit_binary_values_ && value->GetType() == Value::TYPE_BINARY) { continue; } @@ -152,8 +153,7 @@ void JSONWriter::BuildJSONString(const Value* const node, json_string_->append(" "); } - BuildJSONString(value, depth, escape, omit_binary_values, - omit_double_type_preservation); + BuildJSONString(value, depth); } if (pretty_print_) @@ -177,7 +177,7 @@ void JSONWriter::BuildJSONString(const Value* const node, bool result = dict->GetWithoutPathExpansion(*key_itr, &value); DCHECK(result); - if (omit_binary_values && value->GetType() == Value::TYPE_BINARY) { + if (omit_binary_values_ && value->GetType() == Value::TYPE_BINARY) { continue; } @@ -195,8 +195,7 @@ void JSONWriter::BuildJSONString(const Value* const node, } else { json_string_->append(":"); } - BuildJSONString(value, depth + 1, escape, omit_binary_values, - omit_double_type_preservation); + BuildJSONString(value, depth + 1); } if (pretty_print_) { @@ -211,7 +210,7 @@ void JSONWriter::BuildJSONString(const Value* const node, case Value::TYPE_BINARY: { - if (!omit_binary_values) { + if (!omit_binary_values_) { NOTREACHED() << "Cannot serialize binary value."; } break; diff --git a/base/json/json_writer.h b/base/json/json_writer.h index 43f8e56..d27fd6b 100644 --- a/base/json/json_writer.h +++ b/base/json/json_writer.h @@ -31,36 +31,36 @@ class BASE_EXPORT JSONWriter { // part as a normal integer (i.e., without using exponential notation // or appending a '.0') as long as the value is within the range of a // 64-bit int. - OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION = 1 << 2 + OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION = 1 << 2, + + // Return a slightly nicer formatted json string (pads with whitespace to + // help with readability). + OPTIONS_PRETTY_PRINT = 1 << 3 }; // Given a root node, generates a JSON string and puts it into |json|. - // If |pretty_print| is true, return a slightly nicer formated json string - // (pads with whitespace to help readability). If |pretty_print| is false, - // we try to generate as compact a string as possible. // TODO(tc): Should we generate json if it would be invalid json (e.g., // |node| is not a DictionaryValue/ListValue or if there are inf/-inf float // values)? - static void Write(const Value* const node, bool pretty_print, - std::string* json); + static void Write(const Value* const node, std::string* json); // Same as above but with |options| which is a bunch of JSONWriter::Options // bitwise ORed together. - static void WriteWithOptions(const Value* const node, bool pretty_print, - int options, std::string* json); + static void WriteWithOptions(const Value* const node, int options, + std::string* json); // A static, constant JSON string representing an empty array. Useful // for empty JSON argument passing. static const char* kEmptyArray; private: - JSONWriter(bool pretty_print, std::string* json); + JSONWriter(bool escape, bool omit_binary_values, + bool omit_double_type_preservation, bool pretty_print, + std::string* json); // Called recursively to build the JSON string. Whe completed, value is // json_string_ will contain the JSON. - void BuildJSONString(const Value* const node, int depth, bool escape, - bool ignore_binary_values, - bool omit_double_type_preservation); + void BuildJSONString(const Value* const node, int depth); // Appends a quoted, escaped, version of (UTF-8) str to json_string_. void AppendQuotedString(const std::string& str); @@ -68,11 +68,14 @@ class BASE_EXPORT JSONWriter { // Adds space to json_string_ for the indent level. void IndentLine(int depth); + bool escape_; + bool omit_binary_values_; + bool omit_double_type_preservation_; + bool pretty_print_; + // Where we write JSON data as we generate it. std::string* json_string_; - bool pretty_print_; - DISALLOW_COPY_AND_ASSIGN(JSONWriter); }; diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc index 6e73f94..c52a1df4 100644 --- a/base/json/json_writer_unittest.cc +++ b/base/json/json_writer_unittest.cc @@ -12,37 +12,37 @@ TEST(JSONWriterTest, Writing) { // Test null Value* root = Value::CreateNullValue(); std::string output_js; - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("null", output_js); delete root; // Test empty dict root = new DictionaryValue; - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("{}", output_js); delete root; // Test empty list root = new ListValue; - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("[]", output_js); delete root; // Test Real values should always have a decimal or an 'e'. root = Value::CreateDoubleValue(1.0); - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("1.0", output_js); delete root; // Test Real values in the the range (-1, 1) must have leading zeros root = Value::CreateDoubleValue(0.2); - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("0.2", output_js); delete root; // Test Real values in the the range (-1, 1) must have leading zeros root = Value::CreateDoubleValue(-0.8); - JSONWriter::Write(root, false, &output_js); + JSONWriter::Write(root, &output_js); ASSERT_EQ("-0.8", output_js); delete root; @@ -59,9 +59,10 @@ TEST(JSONWriterTest, Writing) { list->Append(Value::CreateBooleanValue(true)); // Test the pretty-printer. - JSONWriter::Write(&root_dict, false, &output_js); + JSONWriter::Write(&root_dict, &output_js); ASSERT_EQ("{\"list\":[{\"inner int\":10},[],true]}", output_js); - JSONWriter::Write(&root_dict, true, &output_js); + JSONWriter::WriteWithOptions(&root_dict, JSONWriter::OPTIONS_PRETTY_PRINT, + &output_js); // The pretty-printer uses a different newline style on Windows than on // other platforms. #if defined(OS_WIN) @@ -85,19 +86,18 @@ TEST(JSONWriterTest, Writing) { period_dict2->SetWithoutPathExpansion("g.h.i.j", Value::CreateIntegerValue(1)); period_dict.SetWithoutPathExpansion("d.e.f", period_dict2); - JSONWriter::Write(&period_dict, false, &output_js); + JSONWriter::Write(&period_dict, &output_js); ASSERT_EQ("{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}", output_js); DictionaryValue period_dict3; period_dict3.Set("a.b", Value::CreateIntegerValue(2)); period_dict3.SetWithoutPathExpansion("a.b", Value::CreateIntegerValue(1)); - JSONWriter::Write(&period_dict3, false, &output_js); + JSONWriter::Write(&period_dict3, &output_js); ASSERT_EQ("{\"a\":{\"b\":2},\"a.b\":1}", output_js); - // Test ignoring binary values. + // Test omitting binary values. root = BinaryValue::CreateWithCopiedBuffer("asdf", 4); - JSONWriter::WriteWithOptions(root, false, - JSONWriter::OPTIONS_OMIT_BINARY_VALUES, + JSONWriter::WriteWithOptions(root, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js); ASSERT_TRUE(output_js.empty()); delete root; @@ -106,7 +106,7 @@ TEST(JSONWriterTest, Writing) { binary_list.Append(Value::CreateIntegerValue(5)); binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4)); binary_list.Append(Value::CreateIntegerValue(2)); - JSONWriter::WriteWithOptions(&binary_list, false, + JSONWriter::WriteWithOptions(&binary_list, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js); ASSERT_EQ("[5,2]", output_js); @@ -115,7 +115,7 @@ TEST(JSONWriterTest, Writing) { binary_dict.Set("a", Value::CreateIntegerValue(5)); binary_dict.Set("b", BinaryValue::CreateWithCopiedBuffer("asdf", 4)); binary_dict.Set("c", Value::CreateIntegerValue(2)); - JSONWriter::WriteWithOptions(&binary_dict, false, + JSONWriter::WriteWithOptions(&binary_dict, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js); ASSERT_EQ("{\"a\":5,\"c\":2}", output_js); @@ -123,7 +123,7 @@ TEST(JSONWriterTest, Writing) { // Test allowing a double with no fractional part to be written as an integer. FundamentalValue double_value(1e10); JSONWriter::WriteWithOptions( - &double_value, false, + &double_value, JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, &output_js); ASSERT_EQ("10000000000", output_js); diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc index d57ddee..837a449 100644 --- a/base/tracked_objects_unittest.cc +++ b/base/tracked_objects_unittest.cc @@ -172,7 +172,7 @@ TEST_F(TrackedObjectsTest, ParentChildTest) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"descendants\":[" "{" @@ -260,7 +260,7 @@ TEST_F(TrackedObjectsTest, DeathDataTest) { scoped_ptr<base::Value> value(data->ToValue()); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"count\":2," "\"queue_ms\":16," @@ -289,7 +289,7 @@ TEST_F(TrackedObjectsTest, DeactivatedBirthOnlyToValueWorkerThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"descendants\":[" "]," @@ -317,7 +317,7 @@ TEST_F(TrackedObjectsTest, DeactivatedBirthOnlyToValueMainThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"descendants\":[" "]," @@ -342,7 +342,7 @@ TEST_F(TrackedObjectsTest, BirthOnlyToValueWorkerThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"descendants\":[" "]," @@ -387,7 +387,7 @@ TEST_F(TrackedObjectsTest, BirthOnlyToValueMainThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string birth_only_result = "{" "\"descendants\":[" "]," @@ -445,7 +445,7 @@ TEST_F(TrackedObjectsTest, LifeCycleToValueMainThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," @@ -511,7 +511,7 @@ TEST_F(TrackedObjectsTest, LifeCycleMidDeactivatedToValueMainThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," @@ -570,7 +570,7 @@ TEST_F(TrackedObjectsTest, LifeCyclePreDeactivatedToValueMainThread) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," @@ -606,7 +606,7 @@ TEST_F(TrackedObjectsTest, LifeCycleToValueWorkerThread) { // Call for the ToValue, but tell it to not the maxes after scanning. scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," @@ -637,14 +637,14 @@ TEST_F(TrackedObjectsTest, LifeCycleToValueWorkerThread) { // We'll still get the same values, but the data will be reset (which we'll // see in a moment). value.reset(ThreadData::ToValue(true)); - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); // Result should be unchanged. EXPECT_EQ(one_line_result, json); // Call for the ToValue, and now we'll see the result of the last translation, // as the max will have been pushed back to zero. value.reset(ThreadData::ToValue(false)); - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result_with_zeros = "{" "\"descendants\":[" "]," @@ -710,7 +710,7 @@ TEST_F(TrackedObjectsTest, TwoLives) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," @@ -772,7 +772,7 @@ TEST_F(TrackedObjectsTest, DifferentLives) { scoped_ptr<base::Value> value(ThreadData::ToValue(false)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); std::string one_line_result = "{" "\"descendants\":[" "]," diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc index 9f7d7ab..39de504 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.cc +++ b/chrome/browser/accessibility/accessibility_extension_api.cc @@ -31,7 +31,7 @@ std::string ControlInfoToJsonString(const AccessibilityEventInfo* info) { info->SerializeToDict(dict); args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); return json_args; } diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc index a1764dc..2350ed3 100644 --- a/chrome/browser/automation/automation_provider_json.cc +++ b/chrome/browser/automation/automation_provider_json.cc @@ -34,7 +34,7 @@ void AutomationJSONReply::SendSuccess(const Value* value) { DCHECK(message_) << "Resending reply for JSON automation request"; std::string json_string = "{}"; if (value) - base::JSONWriter::Write(value, false, &json_string); + base::JSONWriter::Write(value, &json_string); AutomationMsg_SendJSONRequest::WriteReplyParams( message_, json_string, true); provider_->Send(message_); @@ -56,7 +56,7 @@ void AutomationJSONReply::SendError(const Error& error) { dict.SetString("error", error.message()); dict.SetInteger("code", error.code()); std::string json; - base::JSONWriter::Write(&dict, false /* pretty_print */, &json); + base::JSONWriter::Write(&dict, &json); AutomationMsg_SendJSONRequest::WriteReplyParams(message_, json, false); provider_->Send(message_); diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index bdc86e7..8d2139c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -3705,7 +3705,7 @@ void TestingAutomationProvider::GetInitialLoadTimes( initial_load_observer_->GetTimingInformation()); std::string json_return; - base::JSONWriter::Write(return_value.get(), false, &json_return); + base::JSONWriter::Write(return_value.get(), &json_return); AutomationMsg_SendJSONRequest::WriteReplyParams( reply_message, json_return, true); Send(reply_message); diff --git a/chrome/browser/bookmarks/bookmark_extension_api.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc index 645d5df..20d7f3a 100644 --- a/chrome/browser/bookmarks/bookmark_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_extension_api.cc @@ -180,7 +180,7 @@ void BookmarkExtensionEventRouter::BookmarkNodeMoved( args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkMoved, json_args); } @@ -195,7 +195,7 @@ void BookmarkExtensionEventRouter::BookmarkNodeAdded(BookmarkModel* model, args.Append(obj); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkCreated, json_args); } @@ -213,7 +213,7 @@ void BookmarkExtensionEventRouter::BookmarkNodeRemoved( args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, json_args); } @@ -234,7 +234,7 @@ void BookmarkExtensionEventRouter::BookmarkNodeChanged( args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkChanged, json_args); } @@ -259,7 +259,7 @@ void BookmarkExtensionEventRouter::BookmarkNodeChildrenReordered( args.Append(reorder_info); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkChildrenReordered, json_args); @@ -269,7 +269,7 @@ void BookmarkExtensionEventRouter:: ExtensiveBookmarkChangesBeginning(BookmarkModel* model) { ListValue args; std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkImportBegan, json_args); @@ -279,7 +279,7 @@ void BookmarkExtensionEventRouter::ExtensiveBookmarkChangesEnded( BookmarkModel* model) { ListValue args; std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(model->profile(), keys::kOnBookmarkImportEnded, json_args); diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc index b0ca937..cc5be21 100644 --- a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc +++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc @@ -168,7 +168,7 @@ void BookmarkManagerExtensionEventRouter::DispatchEvent(const char* event_name, return; std::string json_args; - base::JSONWriter::Write(args, false, &json_args); + base::JSONWriter::Write(args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToRenderers( event_name, json_args, NULL, GURL()); } diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 3c60c7e..d1fe1ad 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -63,7 +63,7 @@ std::string GetJobString(const ChromeToMobileService::RequestData& data) { kRequestTypeSnapshot : kRequestTypeDelayedSnapshot); } std::string job_string; - base::JSONWriter::Write(job.get(), false, &job_string); + base::JSONWriter::Write(job.get(), &job_string); return job_string; } diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 1bf3385..0817df8 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -230,7 +230,9 @@ void Network::UpdatePropertyMap(PropertyIndex index, const base::Value* value) { entry = value->DeepCopy(); if (VLOG_IS_ON(2)) { std::string value_json; - base::JSONWriter::Write(value, true, &value_json); + base::JSONWriter::WriteWithOptions(value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &value_json); VLOG(2) << "Updated property map on network: " << unique_id() << "[" << index << "] = " << value_json; } diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.cc b/chrome/browser/chromeos/cros/network_library_impl_cros.cc index 97bcd78..375070e 100644 --- a/chrome/browser/chromeos/cros/network_library_impl_cros.cc +++ b/chrome/browser/chromeos/cros/network_library_impl_cros.cc @@ -365,7 +365,9 @@ void NetworkLibraryImplCros::CallConfigureService(const std::string& identifier, if (VLOG_IS_ON(2)) { scoped_ptr<DictionaryValue> dict(ConvertGHashTable(ghash)); std::string dict_json; - base::JSONWriter::Write(static_cast<Value*>(dict.get()), true, &dict_json); + base::JSONWriter::WriteWithOptions(static_cast<Value*>(dict.get()), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &dict_json); VLOG(2) << "ConfigureService will be called on:" << dict_json; } CrosConfigureService(identifier.c_str(), ghash, diff --git a/chrome/browser/chromeos/cros/network_parser.cc b/chrome/browser/chromeos/cros/network_parser.cc index 545582a..7da0408 100644 --- a/chrome/browser/chromeos/cros/network_parser.cc +++ b/chrome/browser/chromeos/cros/network_parser.cc @@ -46,7 +46,9 @@ bool NetworkDeviceParser::UpdateDeviceFromInfo(const DictionaryValue& info, } if (VLOG_IS_ON(2)) { std::string json; - base::JSONWriter::Write(&info, true, &json); + base::JSONWriter::WriteWithOptions(&info, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); VLOG(2) << "Updated device for path " << device->device_path() << ": " << json; } @@ -66,7 +68,9 @@ bool NetworkDeviceParser::UpdateStatus(const std::string& key, } if (VLOG_IS_ON(2)) { std::string value_json; - base::JSONWriter::Write(&value, true, &value_json); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &value_json); VLOG(2) << "Updated value on device: " << device->device_path() << "[" << key << "] = " << value_json; } @@ -138,7 +142,9 @@ bool NetworkParser::UpdateStatus(const std::string& key, } if (VLOG_IS_ON(2)) { std::string value_json; - base::JSONWriter::Write(&value, true, &value_json); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &value_json); VLOG(2) << "Updated value on network: " << network->unique_id() << "[" << key << "] = " << value_json; } diff --git a/chrome/browser/chromeos/cros/onc_network_parser.cc b/chrome/browser/chromeos/cros/onc_network_parser.cc index 3c04ecb..1495305 100644 --- a/chrome/browser/chromeos/cros/onc_network_parser.cc +++ b/chrome/browser/chromeos/cros/onc_network_parser.cc @@ -247,7 +247,7 @@ const bool GetBooleanValue(const base::Value& value) { std::string ConvertValueToString(const base::Value& value) { std::string value_json; - base::JSONWriter::Write(&value, false, &value_json); + base::JSONWriter::Write(&value, &value_json); return value_json; } @@ -459,8 +459,9 @@ Network* OncNetworkParser::ParseNetwork(int n) { if (VLOG_IS_ON(2)) { std::string network_json; - base::JSONWriter::Write(static_cast<const base::Value*>(info), - true, &network_json); + base::JSONWriter::WriteWithOptions(static_cast<const base::Value*>(info), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &network_json); VLOG(2) << "Parsing network at index " << n << ": " << network_json; } @@ -486,8 +487,9 @@ scoped_refptr<net::X509Certificate> OncNetworkParser::ParseCertificate( if (VLOG_IS_ON(2)) { std::string certificate_json; - base::JSONWriter::Write(static_cast<base::Value*>(certificate), - true, &certificate_json); + base::JSONWriter::WriteWithOptions(static_cast<base::Value*>(certificate), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &certificate_json); VLOG(2) << "Parsing certificate at index " << cert_index << ": " << certificate_json; } @@ -563,7 +565,7 @@ Network* OncNetworkParser::CreateNetworkFromInfo( // Update the UI data property. std::string ui_data_json; - base::JSONWriter::Write(network->ui_data(), false, &ui_data_json); + base::JSONWriter::Write(network->ui_data(), &ui_data_json); base::StringValue ui_data_string_value(ui_data_json); network->UpdatePropertyMap(PROPERTY_INDEX_UI_DATA, &ui_data_string_value); @@ -632,7 +634,9 @@ bool OncNetworkParser::ParseNestedObject(Network* network, } if (VLOG_IS_ON(2)) { std::string value_json; - base::JSONWriter::Write(inner_value, true, &value_json); + base::JSONWriter::WriteWithOptions(inner_value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &value_json); VLOG(2) << network->name() << ": Successfully parsed [" << key << "(" << index << ")] = " << value_json; } diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index d743272..e16ff38 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -237,7 +237,7 @@ void ExtensionFileBrowserEventRouter::DispatchFolderChangeEvent( got_error ? kPathWatchError : kPathChanged); std::string args_json; - base::JSONWriter::Write(&args, false /* pretty_print */, &args_json); + base::JSONWriter::Write(&args, &args_json); profile_->GetExtensionEventRouter()->DispatchEventToExtension( iter->first, extension_event_names::kOnFileChanged, args_json, @@ -261,7 +261,7 @@ void ExtensionFileBrowserEventRouter::DispatchDiskEvent( mount_info->Set("volumeInfo", disk_info); std::string args_json; - base::JSONWriter::Write(&args, false /* pretty_print */, &args_json); + base::JSONWriter::Write(&args, &args_json); profile_->GetExtensionEventRouter()->DispatchEventToRenderers( extension_event_names::kOnFileBrowserDiskChanged, args_json, NULL, GURL()); @@ -318,7 +318,7 @@ void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent( } std::string args_json; - base::JSONWriter::Write(&args, false /* pretty_print */, &args_json); + base::JSONWriter::Write(&args, &args_json); profile_->GetExtensionEventRouter()->DispatchEventToRenderers( extension_event_names::kOnFileBrowserMountCompleted, args_json, NULL, GURL()); diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc index 9bc712a..71c5fb1 100644 --- a/chrome/browser/chromeos/extensions/file_handler_util.cc +++ b/chrome/browser/chromeos/extensions/file_handler_util.cc @@ -557,7 +557,7 @@ void FileTaskExecutor::ExecuteFileActionsOnUIThread( UpdateFileHandlerUsageStats(profile_, MakeTaskID(extension_id_, action_id_)); std::string json_args; - base::JSONWriter::Write(event_args.get(), false, &json_args); + base::JSONWriter::Write(event_args.get(), &json_args); event_router->DispatchEventToExtension( extension_id_, std::string("fileBrowserHandler.onExecute"), json_args, profile_, diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc index c78c9cf..509a4d3 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc @@ -250,7 +250,7 @@ GURL GetFileBrowserUrlWithParams( } std::string json_args; - base::JSONWriter::Write(&arg_value, false, &json_args); + base::JSONWriter::Write(&arg_value, &json_args); // kChromeUIFileManagerURL could not be used since query parameters are not // supported for it. @@ -308,7 +308,7 @@ void ViewRemovableDrive(const FilePath& dir) { arg_value.SetBoolean("mountTriggered", true); std::string json_args; - base::JSONWriter::Write(&arg_value, false, &json_args); + base::JSONWriter::Write(&arg_value, &json_args); std::string url = chrome::kChromeUIFileManagerURL; url += "?" + json_args + "#/" + diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc index 5db4ae97..7be5ce1 100644 --- a/chrome/browser/chromeos/extensions/input_method_event_router.cc +++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc @@ -46,7 +46,7 @@ void ExtensionInputMethodEventRouter::InputMethodChanged( new StringValue(GetInputMethodForXkb(current_input_method.id())); args.Append(input_method_name); std::string args_json; - base::JSONWriter::Write(&args, false, &args_json); + base::JSONWriter::Write(&args, &args_json); // The router will only send the event to extensions that are listening. router->DispatchEventToRenderers( diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc index 0442274..9540b0b 100644 --- a/chrome/browser/chromeos/gdata/gdata_file_system.cc +++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc @@ -1553,9 +1553,7 @@ void GDataFileSystem::SaveFeedOnIOThreadPool( FilePath file_name = meta_cache_path.Append(name); std::string json; - base::JSONWriter::Write(feed.get(), - false, // pretty_print - &json); + base::JSONWriter::Write(feed.get(), &json); int file_size = static_cast<int>(json.length()); if (file_util::WriteFile(file_name, json.data(), file_size) != file_size) { diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index ac059af..310f13e 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -759,7 +759,7 @@ TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeAndPunycode) { const DictionaryValue* content_setting_prefs = profile.GetPrefs()->GetDictionary(prefs::kContentSettingsPatternPairs); std::string prefs_as_json; - base::JSONWriter::Write(content_setting_prefs, false, &prefs_as_json); + base::JSONWriter::Write(content_setting_prefs, &prefs_as_json); EXPECT_STREQ("{\"[*.]xn--ira-ppa.com,*\":{\"images\":2}}", prefs_as_json.c_str()); } @@ -844,7 +844,7 @@ TEST_F(HostContentSettingsMapTest, ResourceIdentifierPrefs) { const DictionaryValue* content_setting_prefs = profile.GetPrefs()->GetDictionary(prefs::kContentSettingsPatternPairs); std::string prefs_as_json; - base::JSONWriter::Write(content_setting_prefs, false, &prefs_as_json); + base::JSONWriter::Write(content_setting_prefs, &prefs_as_json); EXPECT_EQ("{}", prefs_as_json); host_content_settings_map->SetContentSetting( @@ -856,7 +856,7 @@ TEST_F(HostContentSettingsMapTest, ResourceIdentifierPrefs) { content_setting_prefs = profile.GetPrefs()->GetDictionary(prefs::kContentSettingsPatternPairs); - base::JSONWriter::Write(content_setting_prefs, false, &prefs_as_json); + base::JSONWriter::Write(content_setting_prefs, &prefs_as_json); EXPECT_EQ("{\"[*.]example.com,*\":{\"per_plugin\":{\"otherplugin\":2}}}", prefs_as_json); } diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 9a0d96c..1a8418a 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -470,7 +470,7 @@ WebContents* DevToolsWindow::OpenURLFromTab(WebContents* source, void DevToolsWindow::CallClientFunction(const string16& function_name, const Value& arg) { std::string json; - base::JSONWriter::Write(&arg, false, &json); + base::JSONWriter::Write(&arg, &json); string16 javascript = function_name + char16('(') + UTF8ToUTF16(json) + ASCIIToUTF16(");"); tab_contents_->web_contents()->GetRenderViewHost()-> diff --git a/chrome/browser/download/download_extension_api.cc b/chrome/browser/download/download_extension_api.cc index 7b951ea..264ab0d 100644 --- a/chrome/browser/download/download_extension_api.cc +++ b/chrome/browser/download/download_extension_api.cc @@ -1066,7 +1066,7 @@ void ExtensionDownloadsEventRouter::DispatchEvent( ListValue args; args.Append(arg); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToRenderers( event_name, json_args, diff --git a/chrome/browser/extensions/api/api_resource_event_notifier.cc b/chrome/browser/extensions/api/api_resource_event_notifier.cc index 1c510cf..692c2c1 100644 --- a/chrome/browser/extensions/api/api_resource_event_notifier.cc +++ b/chrome/browser/extensions/api/api_resource_event_notifier.cc @@ -81,7 +81,7 @@ void APIResourceEventNotifier::DispatchEvent(DictionaryValue* event) { args.Set(0, event); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); router_->DispatchEventToExtension(src_extension_id_, events::kOnAPIResourceEvent, json_args, profile_, src_url_); diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc index 79bbc2e..d058bc2 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api.cc @@ -45,7 +45,7 @@ void ProxyEventRouter::OnProxyError( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); if (profile) { event_router->DispatchEventToRenderers( @@ -77,7 +77,7 @@ void ProxyEventRouter::OnPACScriptError( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); if (profile) { event_router->DispatchEventToRenderers( diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc index 7523352..604c939 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc @@ -56,7 +56,7 @@ void NotifyProcessOutput(Profile* profile, args.Append(new base::StringValue(output)); std::string args_json; - base::JSONWriter::Write(&args, false /* pretty_print */, &args_json); + base::JSONWriter::Write(&args, &args_json); if (profile && profile->GetExtensionEventRouter()) { profile->GetExtensionEventRouter()->DispatchEventToExtension( diff --git a/chrome/browser/extensions/api/webrequest/webrequest_api.cc b/chrome/browser/extensions/api/webrequest/webrequest_api.cc index 01ad3aa..78ef027 100644 --- a/chrome/browser/extensions/api/webrequest/webrequest_api.cc +++ b/chrome/browser/extensions/api/webrequest/webrequest_api.cc @@ -970,7 +970,7 @@ bool ExtensionWebRequestEventRouter::DispatchEvent( if (!((*it)->extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS)) dict->Remove(keys::kResponseHeadersKey, NULL); - base::JSONWriter::Write(args_filtered.get(), false, &json_args); + base::JSONWriter::Write(args_filtered.get(), &json_args); ExtensionEventRouter::DispatchEvent( (*it)->ipc_sender.get(), (*it)->extension_id, (*it)->sub_event_name, diff --git a/chrome/browser/extensions/app_notification.cc b/chrome/browser/extensions/app_notification.cc index 88a4f9f..fe0d1a0 100644 --- a/chrome/browser/extensions/app_notification.cc +++ b/chrome/browser/extensions/app_notification.cc @@ -137,7 +137,9 @@ std::string AppNotification::ToString() const { DictionaryValue value; ToDictionaryValue(&value); std::string result; - base::JSONWriter::Write(&value, true, &result); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &result); return result; } diff --git a/chrome/browser/extensions/app_notification_storage.cc b/chrome/browser/extensions/app_notification_storage.cc index b00f908..914f997 100644 --- a/chrome/browser/extensions/app_notification_storage.cc +++ b/chrome/browser/extensions/app_notification_storage.cc @@ -74,7 +74,7 @@ void AppNotificationListToJSON(const AppNotificationList& list, (*i)->ToDictionaryValue(dictionary); list_value.Append(dictionary); } - JSONWriter::Write(&list_value, false /* pretty_print */, result); + JSONWriter::Write(&list_value, result); } bool JSONToAppNotificationList(const std::string& json, diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 473ca67..ac348df 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -178,7 +178,7 @@ void ExtensionBrowserEventRouter::OnBrowserWindowReady(const Browser* browser) { args.Append(window_dictionary); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(browser->profile(), events::kOnWindowCreated, json_args); } @@ -234,7 +234,7 @@ void ExtensionBrowserEventRouter::OnBrowserSetLastActive( ListValue real_args; real_args.Append(Value::CreateIntegerValue(window_id)); std::string real_json_args; - base::JSONWriter::Write(&real_args, false, &real_json_args); + base::JSONWriter::Write(&real_args, &real_json_args); // When switching between windows in the default and incognitoi profiles, // dispatch WINDOW_ID_NONE to extensions whose profile lost focus that @@ -246,7 +246,7 @@ void ExtensionBrowserEventRouter::OnBrowserSetLastActive( ListValue none_args; none_args.Append( Value::CreateIntegerValue(extension_misc::kUnknownWindowId)); - base::JSONWriter::Write(&none_args, false, &none_json_args); + base::JSONWriter::Write(&none_args, &none_json_args); } DispatchEventsAcrossIncognito((focused_profile_ ? focused_profile_ : @@ -288,7 +288,7 @@ void ExtensionBrowserEventRouter::TabInsertedAt(TabContentsWrapper* contents, args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(contents->profile(), events::kOnTabAttached, json_args); } @@ -312,7 +312,7 @@ void ExtensionBrowserEventRouter::TabDetachedAt(TabContentsWrapper* contents, args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(contents->profile(), events::kOnTabDetached, json_args); } @@ -331,7 +331,7 @@ void ExtensionBrowserEventRouter::TabClosingAt(TabStripModel* tab_strip_model, args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(contents->profile(), events::kOnTabRemoved, json_args); @@ -358,13 +358,13 @@ void ExtensionBrowserEventRouter::ActiveTabChanged( // The onActivated event replaced onActiveChanged and onSelectionChanged. The // deprecated events take two arguments: tabId, {windowId}. std::string old_json_args; - base::JSONWriter::Write(&args, false, &old_json_args); + base::JSONWriter::Write(&args, &old_json_args); // The onActivated event takes one argument: {windowId, tabId}. std::string new_json_args; args.Remove(0, NULL); object_args->Set(tab_keys::kTabIdKey, Value::CreateIntegerValue(tab_id)); - base::JSONWriter::Write(&args, false, &new_json_args); + base::JSONWriter::Write(&args, &new_json_args); Profile* profile = new_contents->profile(); DispatchEvent(profile, events::kOnTabSelectionChanged, old_json_args); @@ -398,7 +398,7 @@ void ExtensionBrowserEventRouter::TabSelectionChanged( args.Append(select_info); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); // The onHighlighted event replaced onHighlightChanged. Profile* profile = tab_strip_model->profile(); @@ -423,7 +423,7 @@ void ExtensionBrowserEventRouter::TabMoved(TabContentsWrapper* contents, args.Append(object_args); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(contents->profile(), events::kOnTabMoved, json_args); } @@ -491,7 +491,7 @@ void ExtensionBrowserEventRouter::DispatchEventWithTab( args.Append(ExtensionTabUtil::CreateTabValueActive( web_contents, active)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); if (!extension_id.empty()) { DispatchEventToExtension(profile, extension_id, event_name, json_args); } else { @@ -508,7 +508,7 @@ void ExtensionBrowserEventRouter::DispatchSimpleBrowserEvent( args.Append(Value::CreateIntegerValue(window_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(profile, event_name, json_args); } @@ -532,7 +532,7 @@ void ExtensionBrowserEventRouter::DispatchTabUpdatedEvent( args.Append(ExtensionTabUtil::CreateTabValue(contents)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext()); DispatchEvent(profile, events::kOnTabUpdated, json_args); @@ -623,7 +623,7 @@ void ExtensionBrowserEventRouter::DispatchOldPageActionEvent( args.Append(data); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEventToExtension(profile, extension_id, "pageActions", json_args); } @@ -663,7 +663,7 @@ void ExtensionBrowserEventRouter::CommandExecuted( ListValue args; args.Append(Value::CreateStringValue(command)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEventToExtension(profile, extension_id, diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc index e1c2823..c417677 100644 --- a/chrome/browser/extensions/extension_cookies_api.cc +++ b/chrome/browser/extensions/extension_cookies_api.cc @@ -101,7 +101,7 @@ void ExtensionCookiesEventRouter::CookieChanged( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); GURL cookie_domain = extension_cookies_helpers::GetURLFromCanonicalCookie(*details->cookie); DispatchEvent(profile, keys::kOnChanged, json_args, cookie_domain); diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc index 8706483..5bf283b 100644 --- a/chrome/browser/extensions/extension_debugger_api.cc +++ b/chrome/browser/extensions/extension_debugger_api.cc @@ -246,7 +246,7 @@ void ExtensionDevToolsClientHost::SendMessageToBackend( protocol_request.Set("params", params->DeepCopy()); std::string json_args; - base::JSONWriter::Write(&protocol_request, false, &json_args); + base::JSONWriter::Write(&protocol_request, &json_args); DevToolsManager::GetInstance()->DispatchOnInspectorBackend(this, json_args); } @@ -258,7 +258,7 @@ void ExtensionDevToolsClientHost::SendDetachedEvent() { args.Append(CreateDebuggeeId(tab_id_)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, keys::kOnDetach, json_args, profile, GURL()); @@ -302,7 +302,7 @@ void ExtensionDevToolsClientHost::DispatchOnInspectorFrontend( args.Append(params_value->DeepCopy()); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, keys::kOnEvent, json_args, profile, GURL()); @@ -482,7 +482,7 @@ void SendCommandDebuggerFunction::SendResponseBody( DictionaryValue* dictionary) { Value* error_body; if (dictionary->Get("error", &error_body)) { - base::JSONWriter::Write(error_body, false, &error_); + base::JSONWriter::Write(error_body, &error_); SendResponse(false); return; } diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc index e31767f..b960117 100644 --- a/chrome/browser/extensions/extension_devtools_bridge.cc +++ b/chrome/browser/extensions/extension_devtools_bridge.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,7 +46,7 @@ static std::string FormatDevToolsMessage(int id, const std::string& method) { message.Set("params", new DictionaryValue); std::string json; - base::JSONWriter::Write(&message, false, &json); + base::JSONWriter::Write(&message, &json); return json; } diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index 44d5a74..e54dee5 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -94,7 +94,7 @@ const std::string ExtensionFunction::GetResult() { std::string json; // Some functions might not need to return any results. if (result_.get()) - base::JSONWriter::Write(result_.get(), false, &json); + base::JSONWriter::Write(result_.get(), &json); return json; } diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index b663ea5..0508088 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -175,7 +175,7 @@ void ExtensionIdleEventRouter::OnIdleStateChange(Profile* profile, ListValue args; args.Append(CreateIdleValue(state)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile->GetExtensionEventRouter()->DispatchEventToRenderers( keys::kOnStateChanged, json_args, profile, GURL()); diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc index 5d0eaca..22ddd91 100644 --- a/chrome/browser/extensions/extension_input_ime_api.cc +++ b/chrome/browser/extensions/extension_input_ime_api.cc @@ -160,7 +160,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(Value::CreateStringValue(engine_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnActivate, json_args, profile_, GURL()); } @@ -173,7 +173,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(Value::CreateStringValue(engine_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnDeactivated, json_args, profile_, GURL()); } @@ -190,7 +190,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnFocus, json_args, profile_, GURL()); } @@ -203,7 +203,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(Value::CreateIntegerValue(context_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnBlur, json_args, profile_, GURL()); } @@ -221,7 +221,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnInputContextUpdate, json_args, profile_, GURL()); @@ -250,7 +250,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnKeyEvent, json_args, profile_, GURL()); } @@ -282,7 +282,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { } std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnCandidateClicked, json_args, profile_, GURL()); @@ -298,7 +298,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer { args.Append(Value::CreateStringValue(menu_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnMenuItemActivated, json_args, profile_, GURL()); diff --git a/chrome/browser/extensions/extension_input_ui_api.cc b/chrome/browser/extensions/extension_input_ui_api.cc index 0024d75..ac151ea 100644 --- a/chrome/browser/extensions/extension_input_ui_api.cc +++ b/chrome/browser/extensions/extension_input_ui_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -113,7 +113,7 @@ void ExtensionInputUiEventRouter::OnHideLookupTable() { args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnUpdateLookupTable, json_args, profile_, GURL()); } @@ -134,7 +134,7 @@ void ExtensionInputUiEventRouter::OnSetCursorLocation( args.Append(Value::CreateIntegerValue(height)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnSetCursorLocation, json_args, profile_, GURL()); } @@ -149,7 +149,7 @@ void ExtensionInputUiEventRouter::OnUpdateAuxiliaryText( args.Append(Value::CreateStringValue(visible ? utf8_text : "")); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnUpdateAuxiliaryText, json_args, profile_, GURL()); } @@ -182,7 +182,7 @@ void ExtensionInputUiEventRouter::OnUpdateLookupTable( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id_, events::kOnUpdateLookupTable, json_args, profile_, GURL()); } diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc index ba80e0d..647e37e 100644 --- a/chrome/browser/extensions/extension_management_api.cc +++ b/chrome/browser/extensions/extension_management_api.cc @@ -512,7 +512,7 @@ void ExtensionManagementEventRouter::Observe( } std::string args_json; - base::JSONWriter::Write(&args, false /* pretty_print */, &args_json); + base::JSONWriter::Write(&args, &args_json); profile->GetExtensionEventRouter()->DispatchEventToRenderers( event_name, args_json, NULL, GURL()); diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index be4f50d..19c0ae9 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -457,7 +457,7 @@ void ExtensionMenuManager::ExecuteCommand( } std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); std::string event_name = "contextMenus"; event_router->DispatchEventToExtension( item->extension_id(), event_name, json_args, profile, GURL(), diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 4ff8314..f0fef50 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -169,7 +169,7 @@ void ExtensionMessageService::OpenChannelToExtension( if (source_contents) { scoped_ptr<DictionaryValue> tab_value( ExtensionTabUtil::CreateTabValue(source_contents)); - base::JSONWriter::Write(tab_value.get(), false, &tab_json); + base::JSONWriter::Write(tab_value.get(), &tab_json); } OpenChannelImpl(source, tab_json, receiver, receiver_port_id, @@ -211,7 +211,7 @@ void ExtensionMessageService::OpenChannelToTab( if (source_contents) { scoped_ptr<DictionaryValue> tab_value( ExtensionTabUtil::CreateTabValue(source_contents)); - base::JSONWriter::Write(tab_value.get(), false, &tab_json); + base::JSONWriter::Write(tab_value.get(), &tab_json); } OpenChannelImpl(source, tab_json, receiver, receiver_port_id, diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc index 493642a..a83e577 100644 --- a/chrome/browser/extensions/extension_omnibox_api.cc +++ b/chrome/browser/extensions/extension_omnibox_api.cc @@ -82,7 +82,7 @@ bool ExtensionOmniboxEventRouter::OnInputChanged( args.Set(0, Value::CreateStringValue(input)); args.Set(1, Value::CreateIntegerValue(suggest_id)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile->GetExtensionEventRouter()->DispatchEventToExtension( extension_id, events::kOnInputChanged, json_args, profile, GURL()); @@ -96,7 +96,7 @@ void ExtensionOmniboxEventRouter::OnInputEntered( ListValue args; args.Set(0, Value::CreateStringValue(input)); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile->GetExtensionEventRouter()->DispatchEventToExtension( extension_id, events::kOnInputEntered, json_args, profile, GURL()); diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc index 5ace8cf..4703dd6 100644 --- a/chrome/browser/extensions/extension_preference_api.cc +++ b/chrome/browser/extensions/extension_preference_api.cc @@ -321,7 +321,7 @@ void ExtensionPreferenceEventRouter::OnPrefChanged( dict->SetString(keys::kLevelOfControl, level_of_control); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(extension_id, event_name, json_args); } diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc index bbf1faf..73f8cc6 100644 --- a/chrome/browser/extensions/extension_processes_api.cc +++ b/chrome/browser/extensions/extension_processes_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -135,7 +135,7 @@ void ExtensionProcessesEventRouter::OnItemsChanged(int start, int length) { args.Append(processes); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); // Notify each profile that is interested. for (ProfileSet::iterator it = profiles_.begin(); diff --git a/chrome/browser/extensions/extension_tts_api_controller.cc b/chrome/browser/extensions/extension_tts_api_controller.cc index 23832f5..2c8be3f8 100644 --- a/chrome/browser/extensions/extension_tts_api_controller.cc +++ b/chrome/browser/extensions/extension_tts_api_controller.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -120,7 +120,7 @@ void Utterance::OnTtsEvent(TtsEventType event_type, event->SetBoolean(constants::kIsFinalEventKey, finished_); args.Set(0, event); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); profile_->GetExtensionEventRouter()->DispatchEventToExtension( src_extension_id_, diff --git a/chrome/browser/extensions/extension_tts_engine_api.cc b/chrome/browser/extensions/extension_tts_engine_api.cc index db0d6fe..d3ee523 100644 --- a/chrome/browser/extensions/extension_tts_engine_api.cc +++ b/chrome/browser/extensions/extension_tts_engine_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -185,7 +185,7 @@ void ExtensionTtsEngineSpeak(Utterance* utterance, args.Set(1, options); args.Set(2, Value::CreateIntegerValue(utterance->id())); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); utterance->profile()->GetExtensionEventRouter()->DispatchEventToExtension( extension->id(), diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 0b365c3..a6047a8 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -89,7 +89,7 @@ void DispatchOnBeforeNavigate(WebContents* web_contents, args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(web_contents->GetBrowserContext(), keys::kOnBeforeNavigate, json_args); @@ -125,7 +125,7 @@ void DispatchOnCommitted(const char* event_name, args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(web_contents->GetBrowserContext(), event_name, json_args); } @@ -144,7 +144,7 @@ void DispatchOnDOMContentLoaded(WebContents* web_contents, args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(web_contents->GetBrowserContext(), keys::kOnDOMContentLoaded, json_args); @@ -165,7 +165,7 @@ void DispatchOnCompleted(WebContents* web_contents, args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(web_contents->GetBrowserContext(), keys::kOnCompleted, json_args); } @@ -198,7 +198,7 @@ void DispatchOnCreatedNavigationTarget( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent( browser_context, keys::kOnCreatedNavigationTarget, json_args); } @@ -219,7 +219,7 @@ void DispatchOnErrorOccurred(WebContents* web_contents, args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(web_contents->GetBrowserContext(), keys::kOnErrorOccurred, json_args); diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index 43d9e93..de08784 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -102,7 +102,7 @@ void PermissionsUpdater::DispatchEvent( PackPermissionSet(changed_permissions); value.Append(permissions->ToValue().release()); std::string json_value; - base::JSONWriter::Write(&value, false, &json_value); + base::JSONWriter::Write(&value, &json_value); profile_->GetExtensionEventRouter()->DispatchEventToExtension( extension_id, event_name, json_value, profile_, GURL()); } diff --git a/chrome/browser/extensions/settings/setting_change.cc b/chrome/browser/extensions/settings/setting_change.cc index 5f0521d..ff1c283 100644 --- a/chrome/browser/extensions/settings/setting_change.cc +++ b/chrome/browser/extensions/settings/setting_change.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -25,7 +25,7 @@ std::string SettingChange::GetEventJson(const SettingChangeList& changes) { changes_value.Set(it->key(), change_value); } std::string json; - base::JSONWriter::Write(&changes_value, false, &json); + base::JSONWriter::Write(&changes_value, &json); return json; } diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc index a3bed62..c5990cc0 100644 --- a/chrome/browser/extensions/settings/settings_apitest.cc +++ b/chrome/browser/extensions/settings/settings_apitest.cc @@ -130,7 +130,7 @@ class ExtensionSettingsApiTest : public ExtensionApiTest { message->SetString("action", action); message->SetBoolean("isFinalAction", is_final_action); std::string message_json; - base::JSONWriter::Write(message.get(), false, &message_json); + base::JSONWriter::Write(message.get(), &message_json); return message_json; } diff --git a/chrome/browser/extensions/settings/settings_leveldb_storage.cc b/chrome/browser/extensions/settings/settings_leveldb_storage.cc index c41d267..e8f8e92 100644 --- a/chrome/browser/extensions/settings/settings_leveldb_storage.cc +++ b/chrome/browser/extensions/settings/settings_leveldb_storage.cc @@ -208,7 +208,7 @@ SettingsStorage::WriteResult SettingsLeveldbStorage::Set( changes->push_back( SettingChange( it.key(), old_value.release(), it.value().DeepCopy())); - base::JSONWriter::Write(&it.value(), false, &value_as_json); + base::JSONWriter::Write(&it.value(), &value_as_json); batch.Put(it.key(), value_as_json); } } diff --git a/chrome/browser/extensions/settings/settings_quota_unittest.cc b/chrome/browser/extensions/settings/settings_quota_unittest.cc index 6314c47..21d95c3 100644 --- a/chrome/browser/extensions/settings/settings_quota_unittest.cc +++ b/chrome/browser/extensions/settings/settings_quota_unittest.cc @@ -34,11 +34,11 @@ class ExtensionSettingsQuotaTest : public testing::Test { void ValidateByteValues() { std::string validate_sizes; - base::JSONWriter::Write(byte_value_1_.get(), false, &validate_sizes); + base::JSONWriter::Write(byte_value_1_.get(), &validate_sizes); ASSERT_EQ(1u, validate_sizes.size()); - base::JSONWriter::Write(byte_value_16_.get(), false, &validate_sizes); + base::JSONWriter::Write(byte_value_16_.get(), &validate_sizes); ASSERT_EQ(16u, validate_sizes.size()); - base::JSONWriter::Write(byte_value_256_.get(), false, &validate_sizes); + base::JSONWriter::Write(byte_value_256_.get(), &validate_sizes); ASSERT_EQ(256u, validate_sizes.size()); } diff --git a/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc b/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc index d0f5ace..f5eb742 100644 --- a/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc +++ b/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc @@ -35,7 +35,7 @@ void Allocate( // TODO(kalman): This is duplicating work that the leveldb delegate // implementation is about to do, and it would be nice to avoid this. std::string value_as_json; - base::JSONWriter::Write(&value, false, &value_as_json); + base::JSONWriter::Write(&value, &value_as_json); size_t new_size = key.size() + value_as_json.size(); size_t existing_size = (*used_per_setting)[key]; diff --git a/chrome/browser/extensions/settings/settings_storage_unittest.cc b/chrome/browser/extensions/settings/settings_storage_unittest.cc index ed8a848..0583e61 100644 --- a/chrome/browser/extensions/settings/settings_storage_unittest.cc +++ b/chrome/browser/extensions/settings/settings_storage_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -20,7 +20,9 @@ const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS; // Gets the pretty-printed JSON for a value. std::string GetJSON(const Value& value) { std::string json; - base::JSONWriter::Write(&value, true, &json); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc index 05a1780..87945e9 100644 --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc @@ -34,7 +34,9 @@ const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS; // Gets the pretty-printed JSON for a value. static std::string GetJson(const Value& value) { std::string json; - base::JSONWriter::Write(&value, true, &json); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/chrome/browser/extensions/settings/settings_sync_util.cc b/chrome/browser/extensions/settings/settings_sync_util.cc index be45a74..8bf0fc7 100644 --- a/chrome/browser/extensions/settings/settings_sync_util.cc +++ b/chrome/browser/extensions/settings/settings_sync_util.cc @@ -25,7 +25,7 @@ void PopulateExtensionSettingSpecifics( specifics->set_key(key); { std::string value_as_json; - base::JSONWriter::Write(&value, false, &value_as_json); + base::JSONWriter::Write(&value, &value_as_json); specifics->set_value(value_as_json); } } diff --git a/chrome/browser/extensions/system/system_api.cc b/chrome/browser/extensions/system/system_api.cc index 38e18a2..c92ad6d 100644 --- a/chrome/browser/extensions/system/system_api.cc +++ b/chrome/browser/extensions/system/system_api.cc @@ -58,7 +58,7 @@ void DispatchEvent(const std::string& event_name, const ListValue& args) { if (!extension_event_router) return; std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); extension_event_router->DispatchEventToRenderers( event_name, json_args, NULL, GURL()); } diff --git a/chrome/browser/history/history_extension_api.cc b/chrome/browser/history/history_extension_api.cc index 2d2695b..02536b4 100644 --- a/chrome/browser/history/history_extension_api.cc +++ b/chrome/browser/history/history_extension_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -134,7 +134,7 @@ void HistoryExtensionEventRouter::HistoryUrlVisited( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(profile, kOnVisited, json_args); } @@ -154,7 +154,7 @@ void HistoryExtensionEventRouter::HistoryUrlsRemoved( args.Append(dict); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEvent(profile, kOnVisitRemoved, json_args); } diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc index 6bec5e0..7b98166 100644 --- a/chrome/browser/history/starred_url_database.cc +++ b/chrome/browser/history/starred_url_database.cc @@ -650,7 +650,9 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) { scoped_ptr<Value> encoded_bookmarks( encoder.Encode(&bookmark_bar_node, &other_node, &mobile_node)); std::string content; - base::JSONWriter::Write(encoded_bookmarks.get(), true, &content); + base::JSONWriter::WriteWithOptions(encoded_bookmarks.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &content); return (file_util::WriteFile(path, content.c_str(), static_cast<int>(content.length())) != -1); diff --git a/chrome/browser/net/net_log_logger.cc b/chrome/browser/net/net_log_logger.cc index bc9cd6a..9ef34d5 100644 --- a/chrome/browser/net/net_log_logger.cc +++ b/chrome/browser/net/net_log_logger.cc @@ -24,7 +24,7 @@ NetLogLogger::NetLogLogger(const FilePath &log_path) { // between Chrome versions. scoped_ptr<Value> value(NetInternalsUI::GetConstants()); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); fprintf(file_.get(), "{\"constants\": %s,\n", json.c_str()); fprintf(file_.get(), "\"events\": [\n"); } @@ -50,7 +50,7 @@ void NetLogLogger::OnAddEntry(net::NetLog::EventType type, // instead of integer identifiers allows logs from older versions to be // loaded, though a little extra parsing has to be done when loading a log. std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); if (!file_.get()) { VLOG(1) << json; } else { diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index 6d6203e..9c0c94d 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -164,7 +164,10 @@ void ConfigurationPolicyHandler::PrepareForDisplaying( if (entry.value->GetAsDictionary(&value)) { std::string json_string; base::JSONWriter::WriteWithOptions( - value, true, base::JSONWriter::OPTIONS_DO_NOT_ESCAPE, &json_string); + value, + base::JSONWriter::OPTIONS_DO_NOT_ESCAPE | + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json_string); StringValue* string_value = Value::CreateStringValue(json_string); policies->Set(it->first, entry.level, entry.scope, string_value); } diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/policy/configuration_policy_handler_chromeos.cc index 2941ddc9..ff43551 100644 --- a/chrome/browser/policy/configuration_policy_handler_chromeos.cc +++ b/chrome/browser/policy/configuration_policy_handler_chromeos.cc @@ -95,8 +95,9 @@ Value* NetworkConfigurationPolicyHandler::SanitizeNetworkConfig( } // Convert back to a string, pretty printing the contents. - base::JSONWriter::WriteWithOptions(config_dict, true, - base::JSONWriter::OPTIONS_DO_NOT_ESCAPE, + base::JSONWriter::WriteWithOptions(config_dict, + base::JSONWriter::OPTIONS_DO_NOT_ESCAPE | + base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string); return Value::CreateStringValue(json_string); } diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc index e907fea..38255a0 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc @@ -76,7 +76,7 @@ CloudPrintSetupFlow* CloudPrintSetupFlow::OpenDialog( args.SetString("pageToShow", setup_done ? "setupdone" : "cloudprintsetup"); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); CloudPrintSetupFlow* flow = new CloudPrintSetupFlow(json_args, profile, delegate, setup_done); @@ -280,7 +280,7 @@ void CloudPrintSetupFlow::ShowGaiaLogin(const DictionaryValue& args) { web_ui_->CallJavascriptFunction("cloudprint.showSetupLogin"); std::string json; - base::JSONWriter::Write(&args, false, &json); + base::JSONWriter::Write(&args, &json); string16 javascript = UTF8ToUTF16("cloudprint.showGaiaLogin(" + json + ");"); ExecuteJavascriptInIFrame(SetupIframeXPath(), javascript); diff --git a/chrome/browser/speech/speech_input_extension_manager.cc b/chrome/browser/speech/speech_input_extension_manager.cc index 7bfc14f..656f282 100644 --- a/chrome/browser/speech/speech_input_extension_manager.cc +++ b/chrome/browser/speech/speech_input_extension_manager.cc @@ -278,7 +278,7 @@ void SpeechInputExtensionManager::SetRecognitionResultOnUIThread( } std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); VLOG(1) << "Results: " << json_args; DispatchEventToExtension(extension_id, kOnResultEvent, json_args); } @@ -441,7 +441,7 @@ void SpeechInputExtensionManager::DispatchEventToExtension( std::string final_args; if (json_args.empty()) { ListValue args; - base::JSONWriter::Write(&args, false, &final_args); + base::JSONWriter::Write(&args, &final_args); } else { final_args = json_args; } @@ -484,7 +484,7 @@ void SpeechInputExtensionManager::DispatchError( args.Append(js_error); js_error->SetString(kErrorCodeKey, error); std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); DispatchEventToExtension(extension_id, kOnErrorEvent, json_args); } diff --git a/chrome/browser/sync/api/sync_data.cc b/chrome/browser/sync/api/sync_data.cc index 3bd271d..02ca7008 100644 --- a/chrome/browser/sync/api/sync_data.cc +++ b/chrome/browser/sync/api/sync_data.cc @@ -121,7 +121,9 @@ std::string SyncData::ToString() const { std::string specifics; scoped_ptr<DictionaryValue> value( browser_sync::EntitySpecificsToValue(GetSpecifics())); - base::JSONWriter::Write(value.get(), true, &specifics); + base::JSONWriter::WriteWithOptions(value.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &specifics); if (IsLocal()) { return "{ isLocal: true, type: " + type + ", tag: " + GetTag() + diff --git a/chrome/browser/sync/notifier/p2p_notifier.cc b/chrome/browser/sync/notifier/p2p_notifier.cc index a8aecb5..e9b4ef20 100644 --- a/chrome/browser/sync/notifier/p2p_notifier.cc +++ b/chrome/browser/sync/notifier/p2p_notifier.cc @@ -104,7 +104,7 @@ std::string P2PNotificationData::ToString() const { P2PNotificationTargetToString(target_)); dict->Set(kChangedTypesKey, syncable::ModelTypeSetToValue(changed_types_)); std::string json; - base::JSONWriter::Write(dict.get(), false /* pretty_print */, &json); + base::JSONWriter::Write(dict.get(), &json); return json; } diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index 1f6042d..0a6ea61 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -1125,6 +1125,8 @@ std::string ProfileSyncServiceHarness::GetServiceStatus() { DictionaryValue value; sync_ui_util::ConstructAboutInformation(service_, &value); std::string service_status; - base::JSONWriter::Write(&value, true, &service_status); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &service_status); return service_status; } diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc index b1a0a8b..d0671e5 100644 --- a/chrome/browser/sync/test/integration/extension_settings_helper.cc +++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc @@ -29,7 +29,9 @@ namespace { std::string ToJson(const Value& value) { std::string json; - base::JSONWriter::Write(&value, true /* pretty print */, &json); + base::JSONWriter::WriteWithOptions(&value, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 2bb55cf..71382da 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -631,7 +631,7 @@ std::string GetLanguageListString( DictionaryValue language_list_dict; language_list_dict.Set("tl", target_languages_dict.release()); std::string language_list_json_str; - base::JSONWriter::Write(&language_list_dict, false, &language_list_json_str); + base::JSONWriter::Write(&language_list_dict, &language_list_json_str); std::string language_list_str("sl("); language_list_str += language_list_json_str; language_list_str += ")"; diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc index 7841ff7..2dcb96a 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc @@ -397,7 +397,7 @@ void KeyboardWidget::TextInputTypeChanged(ui::TextInputType type, } std::string json_args; - base::JSONWriter::Write(&args, false, &json_args); + base::JSONWriter::Write(&args, &json_args); Profile* profile = Profile::FromBrowserContext( diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index b57b3ed..dadc4dc 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -883,7 +883,10 @@ std::string AboutStats(const std::string& query) { std::string data; if (query == "json" || query == kStringsJsPath) { base::JSONWriter::WriteWithOptions( - &root, true, base::JSONWriter::OPTIONS_DO_NOT_ESCAPE, &data); + &root, + base::JSONWriter::OPTIONS_DO_NOT_ESCAPE | + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &data); if (query == kStringsJsPath) data = "var templateData = " + data + ";"; } else if (query == "raw") { diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc index e300d45..74af0a3 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc @@ -130,7 +130,7 @@ class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase { // Put |settings| in to |args| as a JSON string. std::string json_string; - base::JSONWriter::Write(&settings, false, &json_string); + base::JSONWriter::Write(&settings, &json_string); ListValue args; args.Append(new base::StringValue(json_string)); // |args| takes ownership. preview_ui_->handler_->HandlePrint(&args); @@ -155,7 +155,7 @@ class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase { // Put |settings| in to |args| as a JSON string. std::string json_string; - base::JSONWriter::Write(&settings, false, &json_string); + base::JSONWriter::Write(&settings, &json_string); ListValue args; args.Append(new base::StringValue(json_string)); // |args| takes ownership. preview_ui_->handler_->HandlePrint(&args); diff --git a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc index 6f955b7..86139e7 100644 --- a/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc +++ b/chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc @@ -90,7 +90,7 @@ std::string TabModalConfirmDialogWebUI::GetDialogArgs() const { dict.SetString("cancel", delegate_->GetCancelButtonTitle()); ChromeWebUIDataSource::SetFontAndTextDirection(&dict); std::string json; - base::JSONWriter::Write(&dict, false, &json); + base::JSONWriter::Write(&dict, &json); return json; } diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc index 1641e0a..0e7dff7 100644 --- a/chrome/browser/ui/webui/workers_ui.cc +++ b/chrome/browser/ui/webui/workers_ui.cc @@ -107,7 +107,7 @@ void WorkersUIHTMLSource::SendSharedWorkersData(int request_id) { } std::string json_string; - base::JSONWriter::Write(&workers_list, false, &json_string); + base::JSONWriter::Write(&workers_list, &json_string); SendResponse(request_id, base::RefCountedString::TakeString(&json_string)); } diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc index 7cf4e29..a7b0c37 100644 --- a/chrome/common/json_value_serializer_unittest.cc +++ b/chrome/common/json_value_serializer_unittest.cc @@ -110,7 +110,7 @@ TEST(JSONValueSerializerTest, StringEscape) { std::string output_js; DictionaryValue valueRoot; valueRoot.SetString("all_chars", all_chars); - base::JSONWriter::Write(&valueRoot, false, &output_js); + base::JSONWriter::Write(&valueRoot, &output_js); ASSERT_EQ(expected_output, output_js); // Test JSONValueSerializer interface (uses JSONWriter). diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index 055fa1b..7430cc7 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -30,7 +30,7 @@ bool SendAutomationJSONRequest(AutomationMessageSender* sender, DictionaryValue* reply_dict, Error* error) { std::string request, reply; - base::JSONWriter::Write(&request_dict, false, &request); + base::JSONWriter::Write(&request_dict, &request); std::string command; request_dict.GetString("command", &command); LOG(INFO) << "Sending '" << command << "' command."; diff --git a/chrome/test/automation/javascript_message_utils.h b/chrome/test/automation/javascript_message_utils.h index e4b61f4..7c5d778 100644 --- a/chrome/test/automation/javascript_message_utils.h +++ b/chrome/test/automation/javascript_message_utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -77,7 +77,7 @@ template <typename T> std::string JSONStringify(const T& arg) { std::string javascript; scoped_ptr<Value> value(ValueConversionTraits<T>::CreateValueFrom(arg)); - base::JSONWriter::Write(value.get(), false, &javascript); + base::JSONWriter::Write(value.get(), &javascript); return javascript; } diff --git a/chrome/test/webdriver/commands/response.cc b/chrome/test/webdriver/commands/response.cc index 5fece6d..07c6e24 100644 --- a/chrome/test/webdriver/commands/response.cc +++ b/chrome/test/webdriver/commands/response.cc @@ -76,8 +76,7 @@ std::string Response::ToJSON() const { // option so that the JSONWriter doesn't add '.0' to the end and confuse // the WebDriver client. base::JSONWriter::WriteWithOptions( - &data_, false, - base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, &json); + &data_, base::JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION, &json); return json; } diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index f8ea88a..400fcad 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -876,7 +876,7 @@ void Automation::SetLocalStatePreference(const std::string& pref, request_dict.SetString("command", "SetLocalStatePrefs"); request_dict.SetString("path", pref); request_dict.Set("value", scoped_value.release()); - base::JSONWriter::Write(&request_dict, false, &request); + base::JSONWriter::Write(&request_dict, &request); if (!automation()->GetBrowserWindow(0)->SendJSONRequest( request, -1, &response)) { *error = new Error(kUnknownError, base::StringPrintf( @@ -903,7 +903,7 @@ void Automation::SetPreference(const std::string& pref, request_dict.SetInteger("windex", 0); request_dict.SetString("path", pref); request_dict.Set("value", scoped_value.release()); - base::JSONWriter::Write(&request_dict, false, &request); + base::JSONWriter::Write(&request_dict, &request); if (!automation()->GetBrowserWindow(0)->SendJSONRequest( request, -1, &response)) { *error = new Error(kUnknownError, base::StringPrintf( diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc index 7a45145..6faabd6 100644 --- a/chrome/test/webdriver/webdriver_session.cc +++ b/chrome/test/webdriver/webdriver_session.cc @@ -164,7 +164,6 @@ Error* Session::ExecuteScript(const FrameId& frame_id, Value** value) { std::string args_as_json; base::JSONWriter::Write(static_cast<const Value* const>(args), - /*pretty_print=*/false, &args_as_json); // Every injected script is fed through the executeScript atom. This atom @@ -217,7 +216,6 @@ Error* Session::ExecuteAsyncScript(const FrameId& frame_id, Value** value) { std::string args_as_json; base::JSONWriter::Write(static_cast<const Value* const>(args), - /*pretty_print=*/false, &args_as_json); int timeout_ms = async_script_timeout(); diff --git a/chrome/test/webdriver/webdriver_util.cc b/chrome/test/webdriver/webdriver_util.cc index 200ecc0..66754a8 100644 --- a/chrome/test/webdriver/webdriver_util.cc +++ b/chrome/test/webdriver/webdriver_util.cc @@ -392,7 +392,7 @@ bool UnzipSoleFile(const FilePath& unzip_dir, std::string JsonStringify(const Value* value) { std::string json; - base::JSONWriter::Write(value, false, &json); + base::JSONWriter::Write(value, &json); return json; } @@ -456,7 +456,9 @@ std::string JsonStringifyForDisplay(const Value* value) { TruncateContainedStrings(copy.get()); } std::string json; - base::JSONWriter::Write(copy.get(), true /* pretty_print */, &json); + base::JSONWriter::WriteWithOptions(copy.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc index 3016b87c..4cdb6b0 100644 --- a/content/browser/debugger/devtools_http_handler_impl.cc +++ b/content/browser/debugger/devtools_http_handler_impl.cc @@ -387,7 +387,9 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI( } std::string response; - base::JSONWriter::Write(&json_pages_list, true, &response); + base::JSONWriter::WriteWithOptions(&json_pages_list, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &response); Send200(connection_id, response, "application/json; charset=UTF-8"); } diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc index 4c83d0e..0e839bf 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -39,7 +39,7 @@ string16 WebUI::GetJavascriptCall( if (i > 0) parameters += char16(','); - base::JSONWriter::Write(arg_list[i], false, &json); + base::JSONWriter::Write(arg_list[i], &json); parameters += UTF8ToUTF16(json); } return ASCIIToUTF16(function_name) + diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index 5aecf33..9e14ca2 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -441,7 +441,8 @@ RenderNode* InterpretNode(DictionaryValue* node) { string outjson; - JSONWriter::Write(node, true, &outjson); + JSONWriter::WriteWithOptions(node, base::JSONWriter::OPTIONS_PRETTY_PRINT, + &outjson); LOG(ERROR) << "Unrecognized node type! JSON:\n\n" "-----------------------\n" << outjson << diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index 72437a9..8f27c52 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -321,7 +321,7 @@ bool ParamTraits<DictionaryValue>::Read( void ParamTraits<DictionaryValue>::Log(const param_type& p, std::string* l) { std::string json; - base::JSONWriter::Write(&p, false, &json); + base::JSONWriter::Write(&p, &json); l->append(json); } @@ -340,7 +340,7 @@ bool ParamTraits<ListValue>::Read( void ParamTraits<ListValue>::Log(const param_type& p, std::string* l) { std::string json; - base::JSONWriter::Write(&p, false, &json); + base::JSONWriter::Write(&p, &json); l->append(json); } diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc index 8eec167..ffbd23c0 100644 --- a/jingle/glue/utils.cc +++ b/jingle/glue/utils.cc @@ -53,7 +53,7 @@ std::string SerializeP2PCandidate(const cricket::Candidate& candidate) { value.SetInteger("generation", candidate.generation()); std::string result; - base::JSONWriter::Write(&value, false, &result); + base::JSONWriter::Write(&value, &result); return result; } diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index b73b18a..7bc0a31 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.cc @@ -877,7 +877,9 @@ bool TransportSecurityState::Serialise(std::string* output) { toplevel.Set(HashedDomainToExternalString(i->first), state); } - base::JSONWriter::Write(&toplevel, true /* pretty print */, output); + base::JSONWriter::WriteWithOptions(&toplevel, + base::JSONWriter::OPTIONS_PRETTY_PRINT, + output); return true; } diff --git a/net/test/remote_test_server.cc b/net/test/remote_test_server.cc index fc144f2..df1b979 100644 --- a/net/test/remote_test_server.cc +++ b/net/test/remote_test_server.cc @@ -88,7 +88,7 @@ bool RemoteTestServer::Start() { // Generate JSON-formatted argument string. std::string arguments_string; - base::JSONWriter::Write(&arguments_dict, false, &arguments_string); + base::JSONWriter::Write(&arguments_dict, &arguments_string); if (arguments_string.empty()) return false; @@ -108,7 +108,7 @@ bool RemoteTestServer::Start() { // the remote server. server_data_dict.SetInteger("port", test_server_port); std::string server_data; - base::JSONWriter::Write(&server_data_dict, false, &server_data); + base::JSONWriter::Write(&server_data_dict, &server_data); if (server_data.empty() || !ParseServerData(server_data)) { LOG(ERROR) << "Could not parse server_data: " << server_data; return false; diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 35fee2f..0119f8f 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -406,7 +406,7 @@ void ChromotingInstance::PostChromotingMessage( message->Set("data", data.release()); std::string message_json; - base::JSONWriter::Write(message.get(), false, &message_json); + base::JSONWriter::Write(message.get(), &message_json); PostMessage(pp::Var(message_json)); } diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc index 97f1d74..4e8580c 100644 --- a/remoting/host/json_host_config.cc +++ b/remoting/host/json_host_config.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -50,7 +50,9 @@ void JsonHostConfig::Save() { void JsonHostConfig::DoWrite() { std::string file_content; base::AutoLock auto_lock(lock_); - base::JSONWriter::Write(values_.get(), true, &file_content); + base::JSONWriter::WriteWithOptions(values_.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &file_content); // TODO(sergeyu): Move ImportantFileWriter to base and use it here. file_util::WriteFile(filename_, file_content.c_str(), file_content.size()); } diff --git a/sync/engine/model_safe_worker.cc b/sync/engine/model_safe_worker.cc index ab1f750..a5aa04f 100644 --- a/sync/engine/model_safe_worker.cc +++ b/sync/engine/model_safe_worker.cc @@ -25,7 +25,7 @@ std::string ModelSafeRoutingInfoToString( const ModelSafeRoutingInfo& routing_info) { scoped_ptr<DictionaryValue> dict(ModelSafeRoutingInfoToValue(routing_info)); std::string json; - base::JSONWriter::Write(dict.get(), false, &json); + base::JSONWriter::Write(dict.get(), &json); return json; } diff --git a/sync/engine/nigori_util.cc b/sync/engine/nigori_util.cc index 1b6d42a..78bb33c 100644 --- a/sync/engine/nigori_util.cc +++ b/sync/engine/nigori_util.cc @@ -179,7 +179,9 @@ bool UpdateEntryWithEncryption( if (VLOG_IS_ON(2)) { scoped_ptr<DictionaryValue> value(entry->ToValue()); std::string info; - base::JSONWriter::Write(value.get(), true, &info); + base::JSONWriter::WriteWithOptions(value.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &info); DVLOG(2) << "Encrypting specifics of type " << syncable::ModelTypeToString(type) << " with content: " diff --git a/sync/js/js_arg_list.cc b/sync/js/js_arg_list.cc index d8ab8e2..c95235a 100644 --- a/sync/js/js_arg_list.cc +++ b/sync/js/js_arg_list.cc @@ -20,7 +20,7 @@ const ListValue& JsArgList::Get() const { std::string JsArgList::ToString() const { std::string str; - base::JSONWriter::Write(&Get(), false, &str); + base::JSONWriter::Write(&Get(), &str); return str; } diff --git a/sync/js/js_event_details.cc b/sync/js/js_event_details.cc index 693ba4c..b455b01 100644 --- a/sync/js/js_event_details.cc +++ b/sync/js/js_event_details.cc @@ -20,7 +20,7 @@ const DictionaryValue& JsEventDetails::Get() const { std::string JsEventDetails::ToString() const { std::string str; - base::JSONWriter::Write(&Get(), false, &str); + base::JSONWriter::Write(&Get(), &str); return str; } diff --git a/sync/sessions/session_state.cc b/sync/sessions/session_state.cc index a6655f9..2c68125 100644 --- a/sync/sessions/session_state.cc +++ b/sync/sessions/session_state.cc @@ -176,7 +176,9 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const { std::string SyncSessionSnapshot::ToString() const { scoped_ptr<DictionaryValue> value(ToValue()); std::string json; - base::JSONWriter::Write(value.get(), true, &json); + base::JSONWriter::WriteWithOptions(value.get(), + base::JSONWriter::OPTIONS_PRETTY_PRINT, + &json); return json; } diff --git a/sync/syncable/model_type_payload_map.cc b/sync/syncable/model_type_payload_map.cc index dde1cd8..99502b0 100644 --- a/sync/syncable/model_type_payload_map.cc +++ b/sync/syncable/model_type_payload_map.cc @@ -50,7 +50,7 @@ std::string ModelTypePayloadMapToString( scoped_ptr<DictionaryValue> value( ModelTypePayloadMapToValue(type_payloads)); std::string json; - base::JSONWriter::Write(value.get(), false, &json); + base::JSONWriter::Write(value.get(), &json); return json; } |