Misc cleanups in Drive code.

chrome/browser/google_apis/drive_api_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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_OPERATIONS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_OPERATIONS_H_
 
 #include <string>
 
 #include "chrome/browser/google_apis/base_operations.h"
@@ skipping 120 matching lines @@
   // Overridden from GetDataOperation.
   virtual GURL GetURL() const OVERRIDE;
 
  private:
   const DriveApiUrlGenerator url_generator_;
   std::string file_id_;
 
   DISALLOW_COPY_AND_ASSIGN(GetFileOperation);
 };
 
-// This namespace is introduced to avoid class name confliction between
+// This namespace is introduced to avoid class name conflict between
 // the operations for Drive API v2 and GData WAPI for transition.
 // And, when the migration is done and GData WAPI's code is cleaned up,
 // classes inside this namespace should be moved to the google_apis namespace.
 // TODO(hidehiko): Get rid of this namespace after the migration.
 namespace drive {
 
 //========================== CreateDirectoryOperation ==========================
 
 // This class performs the operation for creating a directory.
 class CreateDirectoryOperation : public GetDataOperation {
@@ skipping 120 matching lines @@
   const std::string resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(InsertResourceOperation);
 };
 
 //========================== DeleteResourceOperation ===========================
 
 // This class performs the operation for removing a resource from a directory.
 // Note that we use "delete" for the name of this class, which comes from the
 // operation name of the Drive API v2, although we prefer "remove" for that
-// sence in "drive/google_api"
+// sense in "drive/google_api"
 // Also note that this is the operation of "Children: delete" of the Drive API
 // v2. https://developers.google.com/drive/v2/reference/children/delete
 class DeleteResourceOperation : public EntryActionOperation {
  public:
   // |callback| must not be null.
   DeleteResourceOperation(
       OperationRegistry* registry,
       net::URLRequestContextGetter* url_request_context_getter,
       const DriveApiUrlGenerator& url_generator,
       const std::string& parent_resource_id,
@@ skipping 11 matching lines @@
   const std::string parent_resource_id_;
   const std::string resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteResourceOperation);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_OPERATIONS_H_