Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/chromeos/customization_document.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/timer.h"
 #include "base/values.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 
 class FilePath;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
@@ skipping 77 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(StartupCustomizationDocument);
 };
 
 // OEM services customization document class.
 // ServicesCustomizationDocument is fetched from network or local file but on
 // FILE thread therefore it may not be ready just after creation. Fetching of
 // the manifest should be initiated outside this class by calling
 // StartFetching() method. User of the file should check IsReady before use it.
 class ServicesCustomizationDocument : public CustomizationDocument,
-                                      private URLFetcher::Delegate {
+                                      private content::URLFetcherDelegate {
  public:
   static ServicesCustomizationDocument* GetInstance();
 
   // Registers preferences.
   static void RegisterPrefs(PrefService* local_state);
 
   // Return true if the customization was applied. Customization is applied only
   // once per machine.
   static bool WasApplied();
 
@@ skipping 16 matching lines @@
   ServicesCustomizationDocument();
 
   // C-tor for test construction.
   explicit ServicesCustomizationDocument(const std::string& manifest);
 
   virtual ~ServicesCustomizationDocument();
 
   // Save applied state in machine settings.
   static void SetApplied(bool val);
 
-  // Overriden from URLFetcher::Delegate:
-  virtual void OnURLFetchComplete(const URLFetcher* source,
-                                  const GURL& url,
-                                  const net::URLRequestStatus& status,
-                                  int response_code,
-                                  const net::ResponseCookies& cookies,
-                                  const std::string& data);
+  // Overriden from content::URLFetcherDelegate:
+  virtual void OnURLFetchComplete(const URLFetcher* source);
 
   // Initiate file fetching.
   void StartFileFetch();
 
   // Executes on FILE thread and reads file to string.
   void ReadFileInBackground(const FilePath& file);
 
   // Services customization manifest URL.
   GURL url_;
 
   // URLFetcher instance.
   scoped_ptr<URLFetcher> url_fetcher_;
 
   // Timer to retry fetching file if network is not available.
   base::OneShotTimer<ServicesCustomizationDocument> retry_timer_;
 
   // How many times we already tried to fetch customization manifest file.
   int num_retries_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_