Convert string16 to base::string16 in content.

content/browser/worker_host/worker_process_host.cc

 // 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.
 
 #include "content/browser/worker_host/worker_process_host.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 354 matching lines @@
       // being sent to the worker (messages can still be sent from the worker,
       // for exception reporting, etc).
       i->set_closed(true);
       break;
     }
   }
 }
 
 void WorkerProcessHost::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) {
   *result = GetContentClient()->browser()->AllowWorkerDatabase(
       url, name, display_name, estimated_size, resource_context_,
       GetRenderViewIDsForWorker(worker_route_id));
 }
 
 void WorkerProcessHost::OnAllowFileSystem(int worker_route_id,
                                           const GURL& url,
                                           bool* result) {
   *result = GetContentClient()->browser()->AllowWorkerFileSystem(
       url, resource_context_, GetRenderViewIDsForWorker(worker_route_id));
 }
 
 void WorkerProcessHost::OnAllowIndexedDB(int worker_route_id,
                                          const GURL& url,
-                                         const string16& name,
+                                         const base::string16& name,
                                          bool* result) {
   *result = GetContentClient()->browser()->AllowWorkerIndexedDB(
       url, name, resource_context_, GetRenderViewIDsForWorker(worker_route_id));
 }
 
 void WorkerProcessHost::OnForceKillWorkerProcess() {
   if (process_ && process_launched_)
     base::KillProcess(
           process_->GetData().handle, RESULT_CODE_NORMAL_EXIT, false);
   else
@@ skipping 161 matching lines @@
   *request_context = partition_.url_request_context()->GetURLRequestContext();
 }
 
 net::URLRequestContext* WorkerProcessHost::GetRequestContext(
     ResourceType::Type resource_type) {
   return partition_.url_request_context()->GetURLRequestContext();
 }
 
 WorkerProcessHost::WorkerInstance::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)
     : url_(url),
       closed_(false),
       name_(name),
       worker_route_id_(worker_route_id),
       parent_process_id_(parent_process_id),
       main_resource_appcache_id_(main_resource_appcache_id),
       worker_document_set_(new WorkerDocumentSet()),
       resource_context_(resource_context),
       partition_(partition) {
   DCHECK(resource_context_);
 }
 
 WorkerProcessHost::WorkerInstance::WorkerInstance(
     const GURL& url,
     bool shared,
-    const string16& name,
+    const base::string16& name,
     ResourceContext* resource_context,
     const WorkerStoragePartition& partition)
     : url_(url),
       closed_(false),
       name_(name),
       worker_route_id_(MSG_ROUTING_NONE),
       parent_process_id_(0),
       main_resource_appcache_id_(0),
       worker_document_set_(new WorkerDocumentSet()),
       resource_context_(resource_context),
       partition_(partition) {
   DCHECK(resource_context_);
 }
 
 WorkerProcessHost::WorkerInstance::~WorkerInstance() {
 }
 
 // Compares an instance based on the algorithm in the WebWorkers spec - an
 // instance matches if the origins of the URLs match, and:
 // a) the names are non-empty and equal
 // -or-
 // b) the names are both empty, and the urls are equal
 bool WorkerProcessHost::WorkerInstance::Matches(
     const GURL& match_url,
-    const string16& match_name,
+    const base::string16& match_name,
     const WorkerStoragePartition& partition,
     ResourceContext* resource_context) const {
   // Only match open shared workers.
   if (closed_)
     return false;
 
   // ResourceContext equivalence is being used as a proxy to ensure we only
   // matched shared workers within the same BrowserContext.
   if (resource_context_ != resource_context)
     return false;
@@ skipping 68 matching lines @@
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::FilterInfo
 WorkerProcessHost::WorkerInstance::GetFilter() const {
   DCHECK(NumFilters() == 1);
   return *filters_.begin();
 }
 
 }  // namespace content