diff options
Diffstat (limited to 'content/browser/worker_host')
5 files changed, 26 insertions, 26 deletions
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index a71a28e..acd00fb 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -42,10 +42,10 @@ class WorkerTest : public ContentBrowserTest { const std::string& test_case, const std::string& query) { GURL url = GetTestURL(test_case, query); - const string16 expected_title = ASCIIToUTF16("OK"); + const base::string16 expected_title = ASCIIToUTF16("OK"); TitleWatcher title_watcher(window->web_contents(), expected_title); NavigateToURL(window, url); - string16 final_title = title_watcher.WaitAndGetTitle(); + base::string16 final_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); } @@ -275,10 +275,10 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, WebSocketSharedWorker) { // Run test. Shell* window = shell(); - const string16 expected_title = ASCIIToUTF16("OK"); + const base::string16 expected_title = ASCIIToUTF16("OK"); TitleWatcher title_watcher(window->web_contents(), expected_title); NavigateToURL(window, url); - string16 final_title = title_watcher.WaitAndGetTitle(); + base::string16 final_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); } diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index 08277da..fae589b 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -372,8 +372,8 @@ void WorkerProcessHost::OnWorkerContextClosed(int worker_route_id) { 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( @@ -390,7 +390,7 @@ void WorkerProcessHost::OnAllowFileSystem(int 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)); @@ -572,7 +572,7 @@ net::URLRequestContext* WorkerProcessHost::GetRequestContext( 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, @@ -593,7 +593,7 @@ WorkerProcessHost::WorkerInstance::WorkerInstance( WorkerProcessHost::WorkerInstance::WorkerInstance( const GURL& url, bool shared, - const string16& name, + const base::string16& name, ResourceContext* resource_context, const WorkerStoragePartition& partition) : url_(url), @@ -618,7 +618,7 @@ WorkerProcessHost::WorkerInstance::~WorkerInstance() { // 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. diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h index 0a9ea60..c3fa64d 100644 --- a/content/browser/worker_host/worker_process_host.h +++ b/content/browser/worker_host/worker_process_host.h @@ -57,7 +57,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, 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, @@ -66,7 +66,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, // 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(); @@ -92,7 +92,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, // applies to shared workers. bool Matches( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& partition, ResourceContext* resource_context) const; @@ -107,7 +107,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, 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 { @@ -127,7 +127,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, // 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_; @@ -196,8 +196,8 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, 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, @@ -205,7 +205,7 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate, bool* result); void OnAllowIndexedDB(int worker_route_id, const GURL& url, - const string16& name, + const base::string16& name, bool* result); void OnForceKillWorkerProcess(); diff --git a/content/browser/worker_host/worker_service_impl.cc b/content/browser/worker_host/worker_service_impl.cc index d2ab272..3ebab46 100644 --- a/content/browser/worker_host/worker_service_impl.cc +++ b/content/browser/worker_host/worker_service_impl.cc @@ -650,7 +650,7 @@ void WorkerServiceImpl::NotifyWorkerProcessCreated() { WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindSharedWorkerInstance( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& partition, ResourceContext* resource_context) { for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) { @@ -667,7 +667,7 @@ WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindSharedWorkerInstance( WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindPendingInstance( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& partition, ResourceContext* resource_context) { // Walk the pending instances looking for a matching pending worker. @@ -684,7 +684,7 @@ WorkerProcessHost::WorkerInstance* WorkerServiceImpl::FindPendingInstance( void WorkerServiceImpl::RemovePendingInstances( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& partition, ResourceContext* resource_context) { // Walk the pending instances looking for a matching pending worker. @@ -701,7 +701,7 @@ void WorkerServiceImpl::RemovePendingInstances( WorkerProcessHost::WorkerInstance* WorkerServiceImpl::CreatePendingInstance( const GURL& url, - const string16& name, + const base::string16& name, ResourceContext* resource_context, const WorkerStoragePartition& partition) { // Look for an existing pending shared worker. diff --git a/content/browser/worker_host/worker_service_impl.h b/content/browser/worker_host/worker_service_impl.h index 9da0d19..4d5127a 100644 --- a/content/browser/worker_host/worker_service_impl.h +++ b/content/browser/worker_host/worker_service_impl.h @@ -108,23 +108,23 @@ class CONTENT_EXPORT WorkerServiceImpl // APIs for manipulating our set of pending shared worker instances. WorkerProcessHost::WorkerInstance* CreatePendingInstance( const GURL& url, - const string16& name, + const base::string16& name, ResourceContext* resource_context, const WorkerStoragePartition& worker_partition); WorkerProcessHost::WorkerInstance* FindPendingInstance( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& worker_partition, ResourceContext* resource_context); void RemovePendingInstances( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& worker_partition, ResourceContext* resource_context); WorkerProcessHost::WorkerInstance* FindSharedWorkerInstance( const GURL& url, - const string16& name, + const base::string16& name, const WorkerStoragePartition& worker_partition, ResourceContext* resource_context); |