drive: Rename DriveFileSystemMetadata to FileSystemMetadata

As part of an effort to remove 'drive' prefix from c/b/chromeos/drive.

BUG=231807
TEST=none

Review URL: https://chromiumcodereview.appspot.com/14626003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197334 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 20 insertions, 20 deletions

diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index 366598c..085a8d6 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -81,7 +81,7 @@ void RunGetEntryInfoWithFilePathCallback(
 // Callback for ResourceMetadata::GetLargestChangestamp.
 // |callback| must not be null.
 void OnGetLargestChangestamp(
-    DriveFileSystemMetadata metadata,  // Will be modified.
+    FileSystemMetadata metadata,  // Will be modified.
     const GetFilesystemMetadataCallback& callback,
     int64 largest_changestamp) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -1424,7 +1424,7 @@ void DriveFileSystem::GetMetadata(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  DriveFileSystemMetadata metadata;
+  FileSystemMetadata metadata;
   metadata.refreshing = change_list_loader_->IsRefreshing();
 
   // Metadata related to delta update.
diff --git a/chrome/browser/chromeos/drive/drive_file_system_interface.h b/chrome/browser/chromeos/drive/drive_file_system_interface.h
index 16e0eb9..ee27ac2 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_interface.h
+++ b/chrome/browser/chromeos/drive/drive_file_system_interface.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
-#include "chrome/browser/chromeos/drive/drive_file_system_metadata.h"
+#include "chrome/browser/chromeos/drive/file_system_metadata.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
 
@@ -127,8 +127,8 @@ typedef base::Callback<void(FileError error,
                             int64 bytes_total,
                             int64 bytes_used)> GetAvailableSpaceCallback;
 
-// Used to get drive filesystem metadata.
-typedef base::Callback<void(const DriveFileSystemMetadata&)>
+// Used to get filesystem metadata.
+typedef base::Callback<void(const FileSystemMetadata&)>
     GetFilesystemMetadataCallback;
 
 // Priority of a job.  Higher values are lower priority.
diff --git a/chrome/browser/chromeos/drive/drive_file_system_metadata.cc b/chrome/browser/chromeos/drive/file_system_metadata.cc
index fee1c88..412b93a 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_metadata.cc
+++ b/chrome/browser/chromeos/drive/file_system_metadata.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/drive_file_system_metadata.h"
+#include "chrome/browser/chromeos/drive/file_system_metadata.h"
 
 namespace drive {
 
-DriveFileSystemMetadata::DriveFileSystemMetadata()
+FileSystemMetadata::FileSystemMetadata()
     : largest_changestamp(0),
       refreshing(false),
       last_update_check_error(FILE_ERROR_OK) {
 }
 
-DriveFileSystemMetadata::~DriveFileSystemMetadata() {
+FileSystemMetadata::~FileSystemMetadata() {
 }
 
 }  // namespace drive
diff --git a/chrome/browser/chromeos/drive/drive_file_system_metadata.h b/chrome/browser/chromeos/drive/file_system_metadata.h
index e58ded8..ab44e4f 100644
--- a/chrome/browser/chromeos/drive/drive_file_system_metadata.h
+++ b/chrome/browser/chromeos/drive/file_system_metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_METADATA_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_METADATA_H_
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ -12,9 +12,9 @@
 namespace drive {
 
 // Metadata of DriveFileSystem. Used by DriveFileSystem::GetMetadata().
-struct DriveFileSystemMetadata {
-  DriveFileSystemMetadata();
-  ~DriveFileSystemMetadata();
+struct FileSystemMetadata {
+  FileSystemMetadata();
+  ~FileSystemMetadata();
 
   // The largest changestamp that the file system holds (may be different
   // from the one on the server)
@@ -32,4 +32,4 @@ struct DriveFileSystemMetadata {
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_FILE_SYSTEM_METADATA_H_
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index 0a9e284..ef40f2f 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -253,11 +253,11 @@ class DriveInternalsWebUIHandler : public content::WebUIMessageHandler {
 
   // Callback for DriveFilesystem::GetMetadata for local update.
   void OnGetFilesystemMetadataForLocal(
-      const drive::DriveFileSystemMetadata& metadata);
+      const drive::FileSystemMetadata& metadata);
 
   // Callback for DriveFilesystem::GetMetadata for local update.
   void OnGetFilesystemMetadataForDeltaUpdate(
-      const drive::DriveFileSystemMetadata& metadata);
+      const drive::FileSystemMetadata& metadata);
 
   // Called when the page requests periodic update.
   void OnPeriodicUpdate(const base::ListValue* args);
@@ -473,7 +473,7 @@ void DriveInternalsWebUIHandler::UpdateLocalMetadataSection(
 }
 
 void DriveInternalsWebUIHandler::OnGetFilesystemMetadataForLocal(
-    const drive::DriveFileSystemMetadata& metadata) {
+    const drive::FileSystemMetadata& metadata) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   base::DictionaryValue local_metadata;
@@ -512,7 +512,7 @@ void DriveInternalsWebUIHandler::UpdateDeltaUpdateStatusSection() {
 }
 
 void DriveInternalsWebUIHandler::OnGetFilesystemMetadataForDeltaUpdate(
-    const drive::DriveFileSystemMetadata& metadata) {
+    const drive::FileSystemMetadata& metadata) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Profile* profile = Profile::FromWebUI(web_ui());
   google_apis::DriveNotificationManager* drive_notification_manager =
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index f46e6b0..0bc41cb 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -228,8 +228,6 @@
         'browser/chromeos/drive/drive_file_system.cc',
         'browser/chromeos/drive/drive_file_system.h',
         'browser/chromeos/drive/drive_file_system_interface.h',
-        'browser/chromeos/drive/drive_file_system_metadata.cc',
-        'browser/chromeos/drive/drive_file_system_metadata.h',
         'browser/chromeos/drive/drive_protocol_handler.cc',
         'browser/chromeos/drive/drive_protocol_handler.h',
         'browser/chromeos/drive/drive_system_service.cc',
@@ -257,6 +255,8 @@
         'browser/chromeos/drive/file_system/remove_operation.h',
         'browser/chromeos/drive/file_system/update_operation.cc',
         'browser/chromeos/drive/file_system/update_operation.h',
+        'browser/chromeos/drive/file_system_metadata.cc',
+        'browser/chromeos/drive/file_system_metadata.h',
         'browser/chromeos/drive/file_system_observer.h',
         'browser/chromeos/drive/file_system_proxy.cc',
         'browser/chromeos/drive/file_system_proxy.h',