Reverting 267374 on 36 branch.

chrome/browser/profiles/profile_downloader_unittest.cc

Index: chrome/browser/profiles/profile_downloader_unittest.cc
===================================================================
--- chrome/browser/profiles/profile_downloader_unittest.cc	(revision 280060)
+++ chrome/browser/profiles/profile_downloader_unittest.cc	(working copy)
@@ -4,31 +4,38 @@
 
 #include "chrome/browser/profiles/profile_downloader.h"
 
-#include "base/json/json_reader.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-void GetJSonData(const std::string& full_name,
-                 const std::string& given_name,
-                 const std::string& url,
-                 const std::string& locale,
-                 base::DictionaryValue* dict) {
-  if (!full_name.empty())
-    dict->SetString("displayName", full_name);
+std::string GetJSonData(const std::string& full_name,
+                        const std::string& given_name,
+                        const std::string& url,
+                        const std::string& locale) {
+  std::stringstream stream;
+  bool started = false;
 
-  if (!given_name.empty())
-    dict->SetString("name.givenName", given_name);
+  stream << "{ ";
+  if (!full_name.empty()) {
+    stream << "\"name\": \"" << full_name << "\"";
+    started = true;
+  }
+  if (!given_name.empty()) {
+    stream << (started ? ", " : "") << "\"given_name\": \"" << given_name
+           << "\"";
+    started = true;
+  }
+  if (!url.empty()) {
+    stream << (started ? ", " : "") << "\"picture\": \"" << url << "\"";
+    started = true;
+  }
 
-  if (!url.empty())
-    dict->SetString("image.url", url);
+  if (!locale.empty())
+    stream << (started ? ", " : "") << "\"locale\": \"" << locale << "\"";
 
-  if (!locale.empty())
-    dict->SetString("language", locale);
+  stream << " }";
+  return stream.str();
 }
 
 } // namespace
@@ -51,10 +58,8 @@
     base::string16 parsed_given_name;
     std::string parsed_url;
     std::string parsed_locale;
-    scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-    GetJSonData(full_name, given_name, url, locale, dict.get());
     bool result = ProfileDownloader::ParseProfileJSON(
-        dict.get(),
+        GetJSonData(full_name, given_name, url, locale),
         &parsed_full_name,
         &parsed_given_name,
         &parsed_url,