Move URLFetcherDelegate to net/ and split URLFetcher between net/ and content/

chrome/browser/extensions/app_notify_channel_setup.cc

 // 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/app_notify_channel_setup.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/json/json_reader.h"
 #include "base/message_loop.h"
-#include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
@@ skipping 94 matching lines @@
 }
 void AppNotifyChannelSetup::OnGetTokenFailure(
     const GoogleServiceAuthError& error) {
   EndGetAccessToken(false);
 }
 
 void AppNotifyChannelSetup::OnSyncSetupResult(bool enabled) {
   EndLogin(enabled);
 }
 
-void AppNotifyChannelSetup::OnURLFetchComplete(const URLFetcher* source) {
+void AppNotifyChannelSetup::OnURLFetchComplete(const net::URLFetcher* source) {
   CHECK(source);
   switch (state_) {
     case RECORD_GRANT_STARTED:
       EndRecordGrant(source);
       break;
     case CHANNEL_ID_SETUP_STARTED:
       EndGetChannelId(source);
       break;
     default:
       CHECK(false) << "Wrong state: " << state_;
@@ skipping 122 matching lines @@
   CHECK_EQ(FETCH_ACCESS_TOKEN_DONE, state_);
   state_ = RECORD_GRANT_STARTED;
 
   GURL url = GetOAuth2IssueTokenURL();
   std::string body = MakeOAuth2IssueTokenBody(client_id_, extension_id_);
 
   url_fetcher_.reset(CreateURLFetcher(url, body, oauth2_access_token_));
   url_fetcher_->Start();
 }
 
-void AppNotifyChannelSetup::EndRecordGrant(const URLFetcher* source) {
+void AppNotifyChannelSetup::EndRecordGrant(const net::URLFetcher* source) {
   CHECK_EQ(RECORD_GRANT_STARTED, state_);
 
   net::URLRequestStatus status = source->GetStatus();
 
   if (status.status() == net::URLRequestStatus::SUCCESS) {
     if (source->GetResponseCode() == net::HTTP_OK) {
       state_ = RECORD_GRANT_DONE;
       BeginGetChannelId();
     } else {
       // Successfully done with HTTP request, but got an explicit error.
@@ skipping 10 matching lines @@
 void AppNotifyChannelSetup::BeginGetChannelId() {
   CHECK_EQ(RECORD_GRANT_DONE, state_);
   state_ = CHANNEL_ID_SETUP_STARTED;
 
   GURL url = GetCWSChannelServiceURL();
 
   url_fetcher_.reset(CreateURLFetcher(url, "", oauth2_access_token_));
   url_fetcher_->Start();
 }
 
-void AppNotifyChannelSetup::EndGetChannelId(const URLFetcher* source) {
+void AppNotifyChannelSetup::EndGetChannelId(const net::URLFetcher* source) {
   CHECK_EQ(CHANNEL_ID_SETUP_STARTED, state_);
   net::URLRequestStatus status = source->GetStatus();
 
   if (status.status() == net::URLRequestStatus::SUCCESS) {
     if (source->GetResponseCode() == net::HTTP_OK) {
       std::string data;
       source->GetResponseAsString(&data);
       std::string channel_id;
       bool result = ParseCWSChannelServiceResponse(data, &channel_id);
       if (result) {
@@ skipping 96 matching lines @@
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->Get("id", &channel_id_value))
     return false;
   if (channel_id_value->GetType() != base::Value::TYPE_STRING)
     return false;
 
   StringValue* channel_id = static_cast<StringValue*>(channel_id_value);
   channel_id->GetAsString(result);
   return true;
 }