Replace string16 with base::string16.

chrome/browser/background/background_contents_service.h

Index: chrome/browser/background/background_contents_service.h
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 85f8288e0c6e8eab4bca2c6336ad0a4460ec2815..cfbf9277751e005635c2fab3b935d91705ce93d4 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -63,13 +63,13 @@ class BackgroundContentsService : private content::NotificationObserver,
 
   // Returns the BackgroundContents associated with the passed application id,
   // or NULL if none.
-  BackgroundContents* GetAppBackgroundContents(const string16& appid);
+  BackgroundContents* GetAppBackgroundContents(const base::string16& appid);
 
   // Returns true if there's a registered BackgroundContents for this app. It
   // is possible for this routine to return true when GetAppBackgroundContents()
   // returns false, if the BackgroundContents closed due to the render process
   // crashing.
-  bool HasRegisteredBackgroundContents(const string16& appid);
+  bool HasRegisteredBackgroundContents(const base::string16& appid);
 
   // Returns all currently opened BackgroundContents (used by the task manager).
   std::vector<BackgroundContents*> GetBackgroundContents() const;
@@ -84,7 +84,7 @@ class BackgroundContentsService : private content::NotificationObserver,
   // Gets the parent application id for the passed BackgroundContents. Returns
   // an empty string if no parent application found (e.g. passed
   // BackgroundContents has already shut down).
-  const string16& GetParentApplicationId(BackgroundContents* contents) const;
+  const base::string16& GetParentApplicationId(BackgroundContents* contents) const;
 
   // Creates a new BackgroundContents using the passed |site| and
   // the |route_id| and begins tracking the object internally so it can be
@@ -96,8 +96,8 @@ class BackgroundContentsService : private content::NotificationObserver,
       content::SiteInstance* site,
       int route_id,
       Profile* profile,
-      const string16& frame_name,
-      const string16& application_id,
+      const base::string16& frame_name,
+      const base::string16& application_id,
       const std::string& partition_id,
       content::SessionStorageNamespace* session_storage_namespace);
 
@@ -154,8 +154,8 @@ class BackgroundContentsService : private content::NotificationObserver,
   // and navigates to the passed |url|.
   void LoadBackgroundContents(Profile* profile,
                               const GURL& url,
-                              const string16& frame_name,
-                              const string16& appid);
+                              const base::string16& frame_name,
+                              const base::string16& appid);
 
   // Invoked when a new BackgroundContents is opened.
   void BackgroundContentsOpened(BackgroundContentsOpenedDetails* details);
@@ -174,7 +174,7 @@ class BackgroundContentsService : private content::NotificationObserver,
 
   // Unregisters and deletes the BackgroundContents associated with the
   // passed extension.
-  void ShutdownAssociatedBackgroundContents(const string16& appid);
+  void ShutdownAssociatedBackgroundContents(const base::string16& appid);
 
   // Returns true if this BackgroundContents is in the contents_list_.
   bool IsTracked(BackgroundContents* contents) const;
@@ -197,7 +197,7 @@ class BackgroundContentsService : private content::NotificationObserver,
     // The BackgroundContents whose information we are tracking.
     BackgroundContents* contents;
     // The name of the top level frame for this BackgroundContents.
-    string16 frame_name;
+    base::string16 frame_name;
   };
 
   // Map associating currently loaded BackgroundContents with their parent