Revert of Use new people.get api instead of oauth2/v1/userinfo.

chrome/browser/profiles/profile_downloader_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "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);
-
-  if (!url.empty())
-    dict->SetString("image.url", url);
+  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 (!locale.empty())
-    dict->SetString("language", locale);
+    stream << (started ? ", " : "") << "\"locale\": \"" << locale << "\"";
+
+  stream << " }";
+  return stream.str();
 }
 
 } // namespace
 
 class ProfileDownloaderTest : public testing::Test {
  protected:
   ProfileDownloaderTest() {
   }
 
   virtual ~ProfileDownloaderTest() {
   }
 
   void VerifyWithAccountData(const std::string& full_name,
                              const std::string& given_name,
                              const std::string& url,
                              const std::string& expected_url,
                              const std::string& locale,
                              bool is_valid) {
     base::string16 parsed_full_name;
     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,
         32,
         &parsed_locale);
     EXPECT_EQ(is_valid, result);
     std::string parsed_full_name_utf8 = base::UTF16ToUTF8(parsed_full_name);
     std::string parsed_given_name_utf8 = base::UTF16ToUTF8(parsed_given_name);
 
     EXPECT_EQ(full_name, parsed_full_name_utf8);
@@ skipping 90 matching lines @@
   // Not default G+ photo
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAAAA/G/photo.jpg"));
   // Not default with 6 components
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg"));
   // Not default with 7 components
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg"));
 }