diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 18:35:43 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 18:35:43 +0000 |
| commit | 99e91533369d79c845724349d035949dd4cbfcd1 (patch) | |
| tree | 8568c36de472fcf20974bf7bc1d89356053f08ae /google_apis | |
| parent | 643aff62bd0c103e2129d58a0c29d900d5d7d725 (diff) | |
| download | chromium_src-99e91533369d79c845724349d035949dd4cbfcd1.zip chromium_src-99e91533369d79c845724349d035949dd4cbfcd1.tar.gz chromium_src-99e91533369d79c845724349d035949dd4cbfcd1.tar.bz2 | |
Revert of non-new-profile-management creates a "no-op" style account_reconcilor, (https://codereview.chromium.org/276463002/)
Reason for revert:
unit tests fail on mac
Original issue's description:
> 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.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272131
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272826
NOTRY=true
NOTREECHECKS=true
TBR=mlerman@chromium.org
Review URL: https://codereview.chromium.org/297303003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/fake_gaia.cc | 13 | ||||
| -rw-r--r-- | google_apis/gaia/fake_gaia.h | 2 |
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 |