Convert string16 to base::string16 in content.

content/browser/worker_host/worker_process_host.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 CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 #define CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 39 matching lines @@
 // net::URLRequestContext) that a WorkerProcessHost serves a single
 // BrowserContext.
 class WorkerProcessHost : public BrowserChildProcessHostDelegate,
                           public IPC::Sender {
  public:
   // Contains information about each worker instance, needed to forward messages
   // between the renderer and worker processes.
   class WorkerInstance {
    public:
     WorkerInstance(const GURL& url,
-                   const string16& name,
+                   const base::string16& name,
                    int worker_route_id,
                    int parent_process_id,
                    int64 main_resource_appcache_id,
                    ResourceContext* resource_context,
                    const WorkerStoragePartition& partition);
     // Used for pending instances. Rest of the parameters are ignored.
     WorkerInstance(const GURL& url,
                    bool shared,
-                   const string16& name,
+                   const base::string16& name,
                    ResourceContext* resource_context,
                    const WorkerStoragePartition& partition);
     ~WorkerInstance();
 
     // Unique identifier for a worker client.
     typedef std::pair<WorkerMessageFilter*, int> FilterInfo;
 
     // APIs to manage the filter list for a given instance.
     void AddFilter(WorkerMessageFilter* filter, int route_id);
     void RemoveFilter(WorkerMessageFilter* filter, int route_id);
     void RemoveFilters(WorkerMessageFilter* filter);
     bool HasFilter(WorkerMessageFilter* filter, int route_id) const;
     bool RendererIsParent(int render_process_id, int render_view_id) const;
     int NumFilters() const { return filters_.size(); }
     // Returns the single filter (must only be one).
     FilterInfo GetFilter() const;
 
     typedef std::list<FilterInfo> FilterList;
     const FilterList& filters() const { return filters_; }
 
     // Checks if this WorkerInstance matches the passed url/name params
     // (per the comparison algorithm in the WebWorkers spec). This API only
     // applies to shared workers.
     bool Matches(
         const GURL& url,
-        const string16& name,
+        const base::string16& name,
         const WorkerStoragePartition& partition,
         ResourceContext* resource_context) const;
 
     // Shares the passed instance's WorkerDocumentSet with this instance. This
     // instance's current WorkerDocumentSet is dereferenced (and freed if this
     // is the only reference) as a result.
     void ShareDocumentSet(const WorkerInstance& instance) {
       worker_document_set_ = instance.worker_document_set_;
     };
 
     // Accessors
     bool closed() const { return closed_; }
     void set_closed(bool closed) { closed_ = closed; }
     const GURL& url() const { return url_; }
-    const string16 name() const { return name_; }
+    const base::string16 name() const { return name_; }
     int worker_route_id() const { return worker_route_id_; }
     int parent_process_id() const { return parent_process_id_; }
     int64 main_resource_appcache_id() const {
       return main_resource_appcache_id_;
     }
     WorkerDocumentSet* worker_document_set() const {
       return worker_document_set_.get();
     }
     ResourceContext* resource_context() const {
       return resource_context_;
     }
     const WorkerStoragePartition& partition() const {
       return partition_;
     }
 
    private:
     // Set of all filters (clients) associated with this worker.
     GURL url_;
     bool closed_;
-    string16 name_;
+    base::string16 name_;
     int worker_route_id_;
     int parent_process_id_;
     int64 main_resource_appcache_id_;
     FilterList filters_;
     scoped_refptr<WorkerDocumentSet> worker_document_set_;
     ResourceContext* const resource_context_;
     WorkerStoragePartition partition_;
   };
 
   WorkerProcessHost(ResourceContext* resource_context,
@@ skipping 48 matching lines @@
   // BrowserChildProcessHostDelegate implementation:
   virtual void OnProcessLaunched() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Creates and adds the message filters.
   void CreateMessageFilters(int render_process_id);
 
   void OnWorkerContextClosed(int worker_route_id);
   void OnAllowDatabase(int worker_route_id,
                        const GURL& url,
-                       const string16& name,
-                       const string16& display_name,
+                       const base::string16& name,
+                       const base::string16& display_name,
                        unsigned long estimated_size,
                        bool* result);
   void OnAllowFileSystem(int worker_route_id,
                          const GURL& url,
                          bool* result);
   void OnAllowIndexedDB(int worker_route_id,
                         const GURL& url,
-                        const string16& name,
+                        const base::string16& name,
                         bool* result);
   void OnForceKillWorkerProcess();
 
   // Relays a message to the given endpoint.  Takes care of parsing the message
   // if it contains a message port and sending it a valid route id.
   void RelayMessage(const IPC::Message& message,
                     WorkerMessageFilter* filter,
                     int route_id);
 
   void ShutdownSocketStreamDispatcherHostIfNecessary();
@@ skipping 36 matching lines @@
  public:
   WorkerProcessHostIterator()
       : BrowserChildProcessHostTypeIterator<WorkerProcessHost>(
             PROCESS_TYPE_WORKER) {
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_