| Index: chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc
|
| diff --git a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc b/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc
|
| deleted file mode 100644
|
| index 474b5e30e93fc21bb1a42aef35a0204f0e7c25ac..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.cc
|
| +++ /dev/null
|
| @@ -1,120 +0,0 @@
|
| -// Copyright (c) 2012 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/extensions/api/push_messaging/obfuscated_gaia_id_fetcher.h"
|
| -
|
| -#include <vector>
|
| -
|
| -#include "base/json/json_reader.h"
|
| -#include "base/values.h"
|
| -#include "google_apis/gaia/google_service_auth_error.h"
|
| -#include "net/url_request/url_fetcher.h"
|
| -#include "net/url_request/url_request_status.h"
|
| -
|
| -using net::URLFetcher;
|
| -using net::URLRequestContextGetter;
|
| -using net::URLRequestStatus;
|
| -
|
| -namespace {
|
| -
|
| -// URL of the service to get obfuscated Gaia ID (here misnamed channel ID).
|
| -static const char kCWSChannelServiceURL[] =
|
| - "https://www.googleapis.com/gcm_for_chrome/v1/channels/id";
|
| -
|
| -GoogleServiceAuthError CreateAuthError(const URLFetcher* source) {
|
| - if (source->GetStatus().status() == URLRequestStatus::CANCELED) {
|
| - return GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED);
|
| - } else {
|
| - // TODO(munjal): Improve error handling. Currently we return connection
|
| - // error for even application level errors. We need to either expand the
|
| - // GoogleServiceAuthError enum or create a new one to report better
|
| - // errors.
|
| - if (source->GetStatus().is_success()) {
|
| - DLOG(WARNING) << "Remote server returned " << source->GetResponseCode();
|
| - return GoogleServiceAuthError::FromConnectionError(
|
| - source->GetResponseCode());
|
| - } else {
|
| - DLOG(WARNING) << "URLFetcher failed: " << source->GetStatus().error();
|
| - return GoogleServiceAuthError::FromConnectionError(
|
| - source->GetStatus().error());
|
| - }
|
| - }
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -namespace extensions {
|
| -
|
| -ObfuscatedGaiaIdFetcher::ObfuscatedGaiaIdFetcher(Delegate* delegate)
|
| - : delegate_(delegate) {
|
| - DCHECK(delegate);
|
| -}
|
| -
|
| -ObfuscatedGaiaIdFetcher::~ObfuscatedGaiaIdFetcher() { }
|
| -
|
| -// Returns a set of scopes needed to call the API to get obfuscated Gaia ID.
|
| -// static.
|
| -OAuth2TokenService::ScopeSet ObfuscatedGaiaIdFetcher::GetScopes() {
|
| - OAuth2TokenService::ScopeSet scopes;
|
| - scopes.insert("https://www.googleapis.com/auth/gcm_for_chrome.readonly");
|
| - return scopes;
|
| -}
|
| -
|
| -void ObfuscatedGaiaIdFetcher::ReportSuccess(const std::string& obfuscated_id) {
|
| - if (delegate_)
|
| - delegate_->OnObfuscatedGaiaIdFetchSuccess(obfuscated_id);
|
| -}
|
| -
|
| -void ObfuscatedGaiaIdFetcher::ReportFailure(
|
| - const GoogleServiceAuthError& error) {
|
| - if (delegate_)
|
| - delegate_->OnObfuscatedGaiaIdFetchFailure(error);
|
| -}
|
| -
|
| -GURL ObfuscatedGaiaIdFetcher::CreateApiCallUrl() {
|
| - return GURL(kCWSChannelServiceURL);
|
| -}
|
| -
|
| -std::string ObfuscatedGaiaIdFetcher::CreateApiCallBody() {
|
| - // Nothing to do here, we don't need a body for this request, the URL
|
| - // encodes all the proper arguments.
|
| - return std::string();
|
| -}
|
| -
|
| -void ObfuscatedGaiaIdFetcher::ProcessApiCallSuccess(
|
| - const net::URLFetcher* source) {
|
| - // TODO(munjal): Change error code paths in this method to report an
|
| - // internal error.
|
| - std::string response_body;
|
| - CHECK(source->GetResponseAsString(&response_body));
|
| -
|
| - std::string obfuscated_id;
|
| - if (ParseResponse(response_body, &obfuscated_id))
|
| - ReportSuccess(obfuscated_id);
|
| - else
|
| - // we picked 101 arbitrarily to help us correlate the error with this code.
|
| - ReportFailure(GoogleServiceAuthError::FromConnectionError(101));
|
| -}
|
| -
|
| -void ObfuscatedGaiaIdFetcher::ProcessApiCallFailure(
|
| - const net::URLFetcher* source) {
|
| - ReportFailure(CreateAuthError(source));
|
| -}
|
| -
|
| -// static
|
| -bool ObfuscatedGaiaIdFetcher::ParseResponse(
|
| - const std::string& data, std::string* result) {
|
| - scoped_ptr<base::Value> value(base::JSONReader::Read(data));
|
| -
|
| - if (!value.get())
|
| - return false;
|
| -
|
| - base::DictionaryValue* dict = NULL;
|
| - if (!value->GetAsDictionary(&dict))
|
| - return false;
|
| -
|
| - return dict->GetString("id", result);
|
| -}
|
| -
|
| -} // namespace extensions
|
|
|