diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 23:10:08 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 23:10:08 +0000 |
| commit | 6e2e5e07b144d4c5d1beb5ce185c86476989f50c (patch) | |
| tree | 66dfff24a305a44ccebc46b398f3cbe683f3fe48 | |
| parent | ff6d08788d3be4948e220680051aa5840086db95 (diff) | |
| download | chromium_src-6e2e5e07b144d4c5d1beb5ce185c86476989f50c.zip chromium_src-6e2e5e07b144d4c5d1beb5ce185c86476989f50c.tar.gz chromium_src-6e2e5e07b144d4c5d1beb5ce185c86476989f50c.tar.bz2 | |
Merge 138611 - Add missing initialisation in GaiaOAuthClient::Core.
The changes to address crbug.com/128102 contained a bug whereby the caller-supplied OAuth URLs were not stored to the Core, leading to empty URLs being passed to the URLFetcher. Confusingly, this provoked a URLFetcher response code of net::IO_PENDING, so this CL also adds a CHECK() to remoting/host/url_fetcher.cc to ensure that the supplied URL is valid.
BUG=129449
Review URL: https://chromiumcodereview.appspot.com/10431005
TBR=wez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10438005
git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138649 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/gaia_oauth_client.cc | 3 | ||||
| -rw-r--r-- | remoting/host/url_fetcher.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/remoting/host/gaia_oauth_client.cc b/remoting/host/gaia_oauth_client.cc index aef0ad2..db7d449 100644 --- a/remoting/host/gaia_oauth_client.cc +++ b/remoting/host/gaia_oauth_client.cc @@ -48,7 +48,8 @@ class GaiaOAuthClient::Core public: Core(const OAuthProviderInfo& info, net::URLRequestContextGetter* request_context_getter) - : request_context_getter_(request_context_getter), + : provider_info_(info), + request_context_getter_(request_context_getter), delegate_(NULL) { } diff --git a/remoting/host/url_fetcher.cc b/remoting/host/url_fetcher.cc index 9f5084b..606d1f9 100644 --- a/remoting/host/url_fetcher.cc +++ b/remoting/host/url_fetcher.cc @@ -75,6 +75,7 @@ UrlFetcher::Core::Core(const GURL& url, Method method) method_(method), delegate_message_loop_(base::MessageLoopProxy::current()), buffer_(new net::IOBuffer(kBufferSize)) { + CHECK(url_.is_valid()); } UrlFetcher::Core::~Core() { |