| Index: chrome/browser/sync/sessions/session_state.cc
|
| diff --git a/chrome/browser/sync/sessions/session_state.cc b/chrome/browser/sync/sessions/session_state.cc
|
| index e426d00cadd92cb55c17d5da1ad6d93a87b5a361..cb089d972cf887bf3a87e1a576ec19e44408e07c 100644
|
| --- a/chrome/browser/sync/sessions/session_state.cc
|
| +++ b/chrome/browser/sync/sessions/session_state.cc
|
| @@ -11,6 +11,8 @@
|
| #include <vector>
|
|
|
| #include "base/base64.h"
|
| +#include "base/json/json_writer.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
|
|
|
| @@ -172,6 +174,13 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
|
| return value;
|
| }
|
|
|
| +std::string SyncSessionSnapshot::ToString() const {
|
| + scoped_ptr<DictionaryValue> value(ToValue());
|
| + std::string json;
|
| + base::JSONWriter::Write(value.get(), true, &json);
|
| + return json;
|
| +}
|
| +
|
| ConflictProgress::ConflictProgress(bool* dirty_flag) : dirty_(dirty_flag) {}
|
|
|
| ConflictProgress::~ConflictProgress() {
|
|
|