Move more code into the content namespace.

R=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11190055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162908 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 19 deletions

diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index 61ea8c0..1fde05a 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -24,11 +24,6 @@ class BrowserChildProcessHostImpl;
 class ChromeAppCacheService;
 class IndexedDBContextImpl;
 
-namespace content {
-class ResourceContext;
-class WorkerServiceImpl;
-}  // namespace content
-
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
@@ -37,13 +32,17 @@ namespace webkit_database {
 class DatabaseTracker;
 }  // namespace webkit_database
 
+namespace content {
+class ResourceContext;
+class WorkerServiceImpl;
+
 // The WorkerProcessHost is the interface that represents the browser side of
 // the browser <-> worker communication channel. There will be one
 // WorkerProcessHost per worker process.  Currently each worker runs in its own
 // process, but that may change.  However, we do assume (by storing a
 // net::URLRequestContext) that a WorkerProcessHost serves a single
 // BrowserContext.
-class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
+class WorkerProcessHost : public BrowserChildProcessHostDelegate,
                           public IPC::Sender {
  public:
   // Contains information about each worker instance, needed to forward messages
@@ -55,13 +54,13 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
                    int worker_route_id,
                    int parent_process_id,
                    int64 main_resource_appcache_id,
-                   content::ResourceContext* resource_context,
+                   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,
-                   content::ResourceContext* resource_context,
+                   ResourceContext* resource_context,
                    const WorkerStoragePartition& partition);
     ~WorkerInstance();
 
@@ -88,7 +87,7 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
         const GURL& url,
         const string16& name,
         const WorkerStoragePartition& partition,
-        content::ResourceContext* resource_context) const;
+        ResourceContext* resource_context) const;
 
     // Shares the passed instance's WorkerDocumentSet with this instance. This
     // instance's current WorkerDocumentSet is dereferenced (and freed if this
@@ -110,7 +109,7 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
     WorkerDocumentSet* worker_document_set() const {
       return worker_document_set_;
     }
-    content::ResourceContext* resource_context() const {
+    ResourceContext* resource_context() const {
       return resource_context_;
     }
     const WorkerStoragePartition& partition() const {
@@ -127,11 +126,11 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
     int64 main_resource_appcache_id_;
     FilterList filters_;
     scoped_refptr<WorkerDocumentSet> worker_document_set_;
-    content::ResourceContext* const resource_context_;
+    ResourceContext* const resource_context_;
     WorkerStoragePartition partition_;
   };
 
-  WorkerProcessHost(content::ResourceContext* resource_context,
+  WorkerProcessHost(ResourceContext* resource_context,
                     const WorkerStoragePartition& partition);
   virtual ~WorkerProcessHost();
 
@@ -160,17 +159,17 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
   // Terminates the given worker, i.e. based on a UI action.
   CONTENT_EXPORT void TerminateWorker(int worker_route_id);
 
-  CONTENT_EXPORT const content::ChildProcessData& GetData();
+  CONTENT_EXPORT const ChildProcessData& GetData();
 
   typedef std::list<WorkerInstance> Instances;
   const Instances& instances() const { return instances_; }
 
-  content::ResourceContext* resource_context() const {
+  ResourceContext* resource_context() const {
     return resource_context_;
   }
 
  protected:
-  friend class content::WorkerServiceImpl;
+  friend class WorkerServiceImpl;
 
   Instances& mutable_instances() { return instances_; }
 
@@ -214,7 +213,7 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
 
   Instances instances_;
 
-  content::ResourceContext* const resource_context_;
+  ResourceContext* const resource_context_;
   WorkerStoragePartition partition_;
 
   // A reference to the filter associated with this worker process.  We need to
@@ -228,12 +227,14 @@ class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
 };
 
 class WorkerProcessHostIterator
-    : public content::BrowserChildProcessHostTypeIterator<WorkerProcessHost> {
+    : public BrowserChildProcessHostTypeIterator<WorkerProcessHost> {
  public:
   WorkerProcessHostIterator()
-      : content::BrowserChildProcessHostTypeIterator<WorkerProcessHost>(
-          content::PROCESS_TYPE_WORKER) {
+      : BrowserChildProcessHostTypeIterator<WorkerProcessHost>(
+            PROCESS_TYPE_WORKER) {
   }
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_