Some refactoring in file browser notifications:

chrome/browser/chromeos/extensions/file_browser_notifications.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_CHROMEOS_EXTENSIONS_FILE_BROWSER_NOTIFICATIONS_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_NOTIFICATIONS_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/time.h"
 
 class Profile;
 
 class FileBrowserNotifications
     : public base::SupportsWeakPtr<FileBrowserNotifications> {
  public:
+  // If changing the enum, please also update kNotificationTypes in .cc file.
   enum NotificationType {
     DEVICE,
     DEVICE_FAIL,
     DEVICE_HARD_UNPLUG,
+    DEVICE_EXTERNAL_STORAGE_DISABLED,
     FORMAT_SUCCESS,
     FORMAT_FAIL,
     FORMAT_START,
     FORMAT_START_FAIL,
-    GDATA_SYNC,
-    GDATA_SYNC_SUCCESS,
-    GDATA_SYNC_FAIL,
   };
 
   explicit FileBrowserNotifications(Profile* profile);
   virtual ~FileBrowserNotifications();
 
-  void RegisterDevice(const std::string& path);
-  void UnregisterDevice(const std::string& path);
+  // Registers the removable device whose mount events will be handled in
+  // |ManageNotificationsOnMountComplete|.
+  void RegisterDevice(const std::string& system_path);

[stevenjb, 2012/11/27 01:20:08]

nit: blank line

+  // Unregisters the removable device whose mount events will be handled in
+  // |ManageNotificationsOnMountComplete|.
+  void UnregisterDevice(const std::string& system_path);
 
   void ManageNotificationsOnMountCompleted(const std::string& system_path,
                                            const std::string& label,
                                            bool is_parent,
                                            bool success,
                                            bool is_unsupported);
 
   void ManageNotificationOnGDataSyncProgress(int count);
   void ManageNotificationOnGDataSyncFinish(bool success);
 
-  // Retreives message body based on |type|.
+  // Primary method for showing a notification.
   void ShowNotification(NotificationType type, const std::string& path);
-  // Primary method for showing a notification. Virtual for mock in unittest.
-  virtual void ShowNotificationWithMessage(NotificationType type,
-                                           const std::string& path,
-                                           const string16& message);
   void ShowNotificationDelayed(NotificationType type,
                                const std::string& path,
                                base::TimeDelta delay);
 
   // Primary method for hiding a notification. Virtual for mock in unittest.
   virtual void HideNotification(NotificationType type, const std::string& path);
   void HideNotificationDelayed(NotificationType type,
                                const std::string& path,
                                base::TimeDelta delay);
 
   size_t GetNotificationCountForTest() const {
     return notification_map_.size();
   }
+
   bool HasNotificationForTest(const std::string& id) const {
     return notification_map_.find(id) != notification_map_.end();
   }
 
+  string16 GetNotificationMessageForTest(const std::string& id) const;
+
  private:
   class NotificationMessage;
   struct MountRequestsInfo;
 
   typedef std::map<std::string, MountRequestsInfo> MountRequestsMap;
   typedef std::map<std::string, NotificationMessage*> NotificationMap;
 
-  std::string CreateNotificationId(NotificationType type,
-                                   const std::string& path);
+  // Virtual for mock in unittest.
+  virtual void ShowNotificationWithMessage(NotificationType type,
+                                           const std::string& path,
+                                           const string16& message);
   void ShowNotificationById(NotificationType type,
                             const std::string& notification_id,
                             const string16& message);
   void HideNotificationById(const std::string& notification_id);
   void RemoveNotificationById(const std::string& notification_id);
 
   NotificationMap notification_map_;
   std::set<std::string> hidden_notifications_;
   MountRequestsMap mount_requests_;
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(FileBrowserNotifications);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_NOTIFICATIONS_H_