Reverting 267374 on 36 branch.

chrome/browser/chromeos/login/user_image_manager_browsertest.cc

Index: chrome/browser/chromeos/login/user_image_manager_browsertest.cc
===================================================================
--- chrome/browser/chromeos/login/user_image_manager_browsertest.cc	(revision 280060)
+++ chrome/browser/chromeos/login/user_image_manager_browsertest.cc	(working copy)
@@ -56,7 +56,6 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "crypto/rsa_private_key.h"
-#include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ -230,15 +229,13 @@
 
     static_cast<OAuth2TokenService::Consumer*>(profile_downloader)->
         OnGetTokenSuccess(NULL,
-                          "token",
+                          std::string(),
                           base::Time::Now() + base::TimeDelta::FromDays(1));
 
-    net::TestURLFetcher* fetcher =
-        url_fetcher_factory->GetFetcherByID(
-            gaia::GaiaOAuthClient::kUrlFetcherId);
+    net::TestURLFetcher* fetcher = url_fetcher_factory->GetFetcherByID(0);
     ASSERT_TRUE(fetcher);
     fetcher->SetResponseString(
-        "{ \"image\": {\"url\": \"http://localhost/avatar.jpg\"} }");
+        "{ \"picture\": \"http://localhost/avatar.jpg\" }");
     fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS,
                                               net::OK));
     fetcher->set_response_code(200);