Removed auth token from extension API layer. We won't have a need for it there.

BUG=chromium-os:27456
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9645002

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

6 files changed, 3 insertions, 31 deletions

diff --git a/chrome/browser/chromeos/disks/disk_mount_manager.h b/chrome/browser/chromeos/disks/disk_mount_manager.h
index c6ac92a..6ecb2b7 100644
--- a/chrome/browser/chromeos/disks/disk_mount_manager.h
+++ b/chrome/browser/chromeos/disks/disk_mount_manager.h
@@ -143,8 +143,6 @@ class DiskMountManager {
     std::string source_path;
     // Mounted path.
     std::string mount_path;
-    // Auth token;
-    std::string auth_token;
     // Type of mount.
     MountType mount_type;
     // Condition of mount.
@@ -159,18 +157,6 @@ class DiskMountManager {
           mount_type(type),
           mount_condition(condition) {
     }
-
-    MountPointInfo(const std::string& source,
-                   const std::string& mount,
-                   const std::string& token,
-                   const MountType type,
-                   MountCondition condition)
-        : source_path(source),
-          mount_path(mount),
-          auth_token(token),
-          mount_type(type),
-          mount_condition(condition) {
-    }
   };
 
   // MountPointMap key is mount_path.
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index b539b3a..d743272 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -295,10 +295,6 @@ void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent(
             &source_url)) {
       mount_info_value->SetString("sourceUrl", source_url.spec());
     }
-
-    if (mount_info.mount_type == chromeos::MOUNT_TYPE_GDATA)
-      mount_info_value->SetString("authToken", mount_info.auth_token);
-
   } else {
     mount_info_value->SetString("sourceUrl", mount_info.source_path);
   }
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 081585b..92295158 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -1492,14 +1492,12 @@ void AddMountFunction::AddGDataMountPoint() {
                                 new gdata::GDataFileSystemProxy(profile_));
 }
 
-void AddMountFunction::RaiseGDataMountEvent(gdata::GDataErrorCode error,
-                                            const std::string auth_token) {
+void AddMountFunction::RaiseGDataMountEvent(gdata::GDataErrorCode error) {
   chromeos::MountError error_code = error == gdata::HTTP_SUCCESS ?
       chromeos::MOUNT_ERROR_NONE : chromeos::MOUNT_ERROR_NOT_AUTHENTICATED;
   DiskMountManager::MountPointInfo mount_info(
       gdata::util::GetGDataMountPointPathAsString(),
       gdata::util::GetGDataMountPointPathAsString(),
-      auth_token,
       chromeos::MOUNT_TYPE_GDATA,
       chromeos::disks::MOUNT_CONDITION_NONE);
   // Raise mount event
@@ -1514,7 +1512,7 @@ void AddMountFunction::OnGDataAuthentication(gdata::GDataErrorCode error,
   if (error == gdata::HTTP_SUCCESS)
     AddGDataMountPoint();
 
-  RaiseGDataMountEvent(error, token);
+  RaiseGDataMountEvent(error);
   SendResponse(true);
 }
 
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_browser_private_api.h
index 1b3c53c..9307720 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.h
@@ -240,8 +240,7 @@ class AddMountFunction
 
  private:
   // Sends gdata mount event to renderers.
-  void RaiseGDataMountEvent(gdata::GDataErrorCode error,
-                            const std::string auth_token);
+  void RaiseGDataMountEvent(gdata::GDataErrorCode error);
   // Adds gdata mount point.
   void AddGDataMountPoint();
   // A callback method to handle the result of GData authentication request.
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 3f51ddb..7196667 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -2442,7 +2442,6 @@ FileManager.prototype = {
       metrics.recordInterval('Load.GData');
       if (event.status == 'success') {
         self.gdataMounted_ = true;
-        self.gdataAuthToken_ = event.authToken;
         self.gdataMountInfo_ = {
           "mountPath": event.mountPath,
           "sourceUrl": event.sourceUrl,
@@ -2451,7 +2450,6 @@ FileManager.prototype = {
         };
       } else {
         self.gdataMounted_ = false;
-        self.gdataAuthToken_ = null;
         self.gdataMountInfo_ = null;
       }
     }
diff --git a/chrome/common/extensions/api/fileBrowserPrivate.json b/chrome/common/extensions/api/fileBrowserPrivate.json
index 4e33495..4521499 100644
--- a/chrome/common/extensions/api/fileBrowserPrivate.json
+++ b/chrome/common/extensions/api/fileBrowserPrivate.json
@@ -241,11 +241,6 @@
             "optional": true,
             "description": "Path that sourcePath was mounted to."
           },
-          "authToken": {
-            "type": "string",
-            "optional": true,
-            "description": "Authentication token for gdata calls."
-          },
           "mountType": {
             "type": "string",
             "enum": ["device", "file", "network", "gdata"],