Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/ui/webui/screenshot_source.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_UI_WEBUI_SCREENSHOT_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/gdata/drive_errorcode.h"
 #include "chrome/browser/chromeos/gdata/drive_resource_metadata.h"
-#include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #endif
 
 typedef std::vector<unsigned char> ScreenshotData;
 typedef linked_ptr<ScreenshotData> ScreenshotDataPtr;
 
 class FilePath;
 class Profile;
 
 // ScreenshotSource is the data source that serves screenshots (saved
 // or current) to the bug report html ui.
@@ skipping 27 matching lines @@
 #if defined(OS_CHROMEOS)
   // Send a saved screenshot image file specified by the given screenshot path
   // to the requestor.
   void SendSavedScreenshot(const std::string& screenshot_path,
                            int request_id,
                            const FilePath& file);
 
   // The callback for GData's getting file method.
   void GetSavedScreenshotCallback(const std::string& screenshot_path,
                                   int request_id,
-                                  gdata::GDataFileError error,
+                                  gdata::DriveFileError error,
                                   const FilePath& file,
                                   const std::string& unused_mime_type,
                                   gdata::DriveFileType file_type);
 
 #endif
   // Sends the screenshot data to the requestor while caching it locally to the
   // class instance, indexed by path.
   void CacheAndSendScreenshot(const std::string& screenshot_path,
                               int request_id,
                               ScreenshotDataPtr bytes);
 
   // Pointer to the screenshot data for the current screenshot.
   ScreenshotDataPtr current_screenshot_;
 
   Profile* profile_;
 
   // Key: Relative path to the screenshot (including filename)
   // Value: Pointer to the screenshot data associated with the path.
   std::map<std::string, ScreenshotDataPtr> cached_screenshots_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenshotSource);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SCREENSHOT_SOURCE_H_