Moved ScopedPtrMap into base namespace.

chrome/browser/media_galleries/gallery_watch_manager.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_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 91 matching lines @@
 
     std::set<WatchOwner> owners;
     base::Time last_notify_time;
     bool delayed_notification_pending;
   };
 
   typedef std::map<WatchOwner, base::FilePath> WatchesMap;
   typedef std::map<base::FilePath, NotificationInfo> WatchedPaths;
   typedef std::map<content::BrowserContext*, GalleryWatchManagerObserver*>
       ObserverMap;
-  typedef ScopedPtrMap<content::BrowserContext*,
-                       scoped_ptr<KeyedServiceShutdownNotifier::Subscription>>
+  typedef base::ScopedPtrMap<
+      content::BrowserContext*,
+      scoped_ptr<KeyedServiceShutdownNotifier::Subscription>>
       BrowserContextSubscriptionMap;
 
   // Ensure there is a subscription to shutdown notifications for
   // |browser_context|.
   void EnsureBrowserContextSubscription(
       content::BrowserContext* browser_context);
 
   // Stop the FilePathWatcher for |path|. Updates |watched_paths_| but not
   // |registered_watches_|.
   void DeactivateFileWatch(const WatchOwner& owner, const base::FilePath& path);
@@ skipping 40 matching lines @@
   // Removes watches when a browser context is shut down as watches contain raw
   // pointers.
   BrowserContextSubscriptionMap browser_context_subscription_map_;
 
   base::WeakPtrFactory<GalleryWatchManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GalleryWatchManager);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_GALLERY_WATCH_MANAGER_H_