Revert 272131 "non-new-profile-management creates a "no-op" styl..."

broke tests:
AccountReconcilorTest.SigninManagerRegistration
AccountReconcilorTest.Reauth

(fail with TIMED OUT)

> non-new-profile-management creates a "no-op" style account_reconcilor,
> useful for tracking stats but won't have any real effects.
> 
> Modify the AccountReconcilor_unittest to execute with the new_profile_management flag on.
> 
> BUG=357693
> TEST=Account Reconciler should function normally when
> new_profile_management flag is on. Should not have effects when the
> flag is off, but UMA stats (histograms) and logging (for
> --vmodule=account_reconcilor=1) should still trace the execution path.
> 
> Review URL: https://codereview.chromium.org/276463002

TBR=mlerman@chromium.org

Review URL: https://codereview.chromium.org/292123007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272147 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 15 deletions

diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc
index edf3647..4cfe604 100644
--- a/google_apis/gaia/fake_gaia.cc
+++ b/google_apis/gaia/fake_gaia.cc
@@ -50,7 +50,6 @@ const char kAuthHeaderOAuth[] = "OAuth ";
 
 const char kListAccountsResponseFormat[] =
     "[\"gaia.l.a.r\",[[\"gaia.l.a\",1,\"\",\"%s\",\"\",1,1,0]]]";
-const char kPeopleGetResponseFormat[] = "{\"id\":\"%s\"}";
 
 typedef std::map<std::string, std::string> CookieMap;
 
@@ -177,10 +176,6 @@ void FakeGaia::Initialize() {
   // Handles /ListAccounts GAIA call.
   REGISTER_RESPONSE_HANDLER(
       gaia_urls->list_accounts_url(), HandleListAccounts);
-
-  // Handles /plus/v1/people/me
-  REGISTER_RESPONSE_HANDLER(
-      gaia_urls->people_get_url(), HandlePeopleGet);
 }
 
 scoped_ptr<HttpResponse> FakeGaia::HandleRequest(const HttpRequest& request) {
@@ -534,11 +529,3 @@ void FakeGaia::HandleListAccounts(const HttpRequest& request,
       kListAccountsResponseFormat, merge_session_params_.email.c_str()));
   http_response->set_code(net::HTTP_OK);
 }
-
-
-void FakeGaia::HandlePeopleGet(const HttpRequest& request,
-                                 BasicHttpResponse* http_response) {
-  http_response->set_content(base::StringPrintf(
-      kPeopleGetResponseFormat, "name"));
-  http_response->set_code(net::HTTP_OK);
-}
diff --git a/google_apis/gaia/fake_gaia.h b/google_apis/gaia/fake_gaia.h
index 13a63e6..ef49cd6 100644
--- a/google_apis/gaia/fake_gaia.h
+++ b/google_apis/gaia/fake_gaia.h
@@ -150,8 +150,6 @@ class FakeGaia {
                         net::test_server::BasicHttpResponse* http_response);
   void HandleListAccounts(const net::test_server::HttpRequest& request,
                           net::test_server::BasicHttpResponse* http_response);
-  void HandlePeopleGet(const net::test_server::HttpRequest& request,
-                       net::test_server::BasicHttpResponse* http_response);
 
   // Returns the access token associated with |auth_token| that matches the
   // given |client_id| and |scope_string|. If |scope_string| is empty, the first