PlatformNotificationService layering cleanup.

chrome/browser/notifications/platform_notification_service_impl.h

 // Copyright 2014 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_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 #define CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 33 matching lines @@
   enum NotificationOperation {
     NOTIFICATION_CLICK,
     NOTIFICATION_CLOSE,
     NOTIFICATION_SETTINGS
   };
 
   // Returns the active instance of the service in the browser process. Safe to
   // be called from any thread.
   static PlatformNotificationServiceImpl* GetInstance();
 
-  // Returns the notification display service to use. This is overriden in tests
-  // TODO(miguelg) make it private once the tests are updated
-  NotificationDisplayService* GetNotificationDisplayService(Profile* profile);
-
   // Load the profile corresponding to |profile_id| and perform the
   // |operation| on the given notification once it has been loaded.
   void ProcessPersistentNotificationOperation(
       NotificationOperation operation,
       const std::string& profile_id,
       bool incognito,
       const GURL& origin,
       int64_t persistent_notification_id,
       int action_index);
 
@@ skipping 68 matching lines @@
       Profile* profile,
       const GURL& origin,
       const content::PlatformNotificationData& notification_data,
       const content::NotificationResources& notification_resources,
       NotificationDelegate* delegate) const;
 
   // Returns a display name for an origin, to be used in the context message
   base::string16 DisplayNameForContextMessage(Profile* profile,
                                               const GURL& origin) const;
 
+  // Returns the notification display service to use.
+  // This can be overriden in tests
+  NotificationDisplayService* GetNotificationDisplayService(Profile* profile);
+
   void SetNotificationDisplayServiceForTesting(
       NotificationDisplayService* service);
 
   // Mapping between a persistent notification id and the id of the associated
   // message_center::Notification object. Must only be used on the UI thread.
   std::map<int64_t, std::string> persistent_notifications_;
 
   // Tracks the id of persistent notifications that have been closed
   // programmatically to avoid dispatching close events for them.
   std::unordered_set<int64_t> closed_notifications_;
 
   // Only set and used for tests, owned by the caller in that case.
   NotificationDisplayService* test_display_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformNotificationServiceImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_PLATFORM_NOTIFICATION_SERVICE_IMPL_H_