Misc cleanups in Drive code.

chrome/browser/google_apis/base_operations.h

 // 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.
 //
 // This file provides base classes used to implement operations for Google APIs.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/google_apis/drive_upload_mode.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/operation_registry.h"
-#include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-class OAuth2AccessTokenFetcher;
-
 namespace base {
 class Value;
 }  // namespace base
 
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace google_apis {
 
-// Callback used to pass parsed JSON from ParseJson(). If parsing error occures,
+// Callback used to pass parsed JSON from ParseJson(). If parsing error occurs,
 // then the passed argument is null.
 typedef base::Callback<void(scoped_ptr<base::Value> value)> ParseJsonCallback;
 
 // Parses JSON passed in |json| on blocking pool. Runs |callback| on the calling
 // thread when finished with either success or failure.
 // The callback must not be null.
 void ParseJson(const std::string& json, const ParseJsonCallback& callback);
 
 //======================= AuthenticatedOperationInterface ======================
 
@@ skipping 355 matching lines @@
   const DownloadActionCallback download_action_callback_;
   const GetContentCallback get_content_callback_;
   const GURL download_url_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileOperation);
 };
 
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_BASE_OPERATIONS_H_