Upstream version 9.37.197.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / task_manager / worker_resource_provider.h

diff --git a/src/chrome/browser/task_manager/worker_resource_provider.h b/src/chrome/browser/task_manager/worker_resource_provider.h
index 8e8c1cb..25df691 100644 (file)
--- a/src/chrome/browser/task_manager/worker_resource_provider.h
+++ b/src/chrome/browser/task_manager/worker_resource_provider.h
@@ -36,8 +36,8 @@ class WorkerResourceProvider : public ResourceProvider,
 
   // ResourceProvider implementation.
   virtual Resource* GetResource(int origin_pid,
-                                int render_process_host_id,
-                                int routing_id) OVERRIDE;
+                                int child_id,
+                                int route_id) OVERRIDE;
   virtual void StartUpdating() OVERRIDE;
   virtual void StopUpdating() OVERRIDE;
 
@@ -49,7 +49,7 @@ class WorkerResourceProvider : public ResourceProvider,
 
   // content::WorkerServiceObserver implementation.
   virtual void WorkerCreated(const GURL& url,
-                             const string16& name,
+                             const base::string16& name,
                              int process_id,
                              int route_id) OVERRIDE;
   virtual void WorkerDestroyed(int process_id, int route_id) OVERRIDE;