Move debugger and appcache to the content namespace.

Review URL: https://codereview.chromium.org/11267015

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

8 files changed, 35 insertions, 18 deletions

diff --git a/content/browser/appcache/appcache_browsertest.cc b/content/browser/appcache/appcache_browsertest.cc
index dfd5f1e..030178f 100644
--- a/content/browser/appcache/appcache_browsertest.cc
+++ b/content/browser/appcache/appcache_browsertest.cc
@@ -4,6 +4,8 @@
 
 #include "content/test/layout_browsertest.h"
 
+namespace content {
+
 class AppCacheLayoutTest : public InProcessBrowserLayoutTest {
  public:
   AppCacheLayoutTest() : InProcessBrowserLayoutTest(
@@ -95,3 +97,5 @@ IN_PROC_BROWSER_TEST_F(AppCacheLayoutTest, DISABLED_PHP) {
   for (size_t i = 0; i < arraysize(kPHPTests); ++i)
     RunHttpLayoutTest(kPHPTests[i]);
 }
+
+}  // namespace content
diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc
index 577746d..ac4564c 100644
--- a/content/browser/appcache/appcache_dispatcher_host.cc
+++ b/content/browser/appcache/appcache_dispatcher_host.cc
@@ -10,8 +10,7 @@
 #include "content/common/appcache_messages.h"
 #include "content/public/browser/user_metrics.h"
 
-using content::BrowserMessageFilter;
-using content::UserMetricsAction;
+namespace content {
 
 AppCacheDispatcherHost::AppCacheDispatcherHost(
     ChromeAppCacheService* appcache_service,
@@ -65,7 +64,7 @@ bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& message,
 AppCacheDispatcherHost::~AppCacheDispatcherHost() {}
 
 void AppCacheDispatcherHost::BadMessageReceived() {
-  content::RecordAction(UserMetricsAction("BadMessageTerminate_ACDH"));
+  RecordAction(UserMetricsAction("BadMessageTerminate_ACDH"));
   BrowserMessageFilter::BadMessageReceived();
 }
 
@@ -226,3 +225,5 @@ void AppCacheDispatcherHost::SwapCacheCallback(bool result, void* param) {
   AppCacheHostMsg_SwapCache::WriteReplyParams(reply_msg, result);
   Send(pending_reply_msg_.release());
 }
+
+}  // namespace content
diff --git a/content/browser/appcache/appcache_dispatcher_host.h b/content/browser/appcache/appcache_dispatcher_host.h
index 90a1bd3..0f1a397 100644
--- a/content/browser/appcache/appcache_dispatcher_host.h
+++ b/content/browser/appcache/appcache_dispatcher_host.h
@@ -14,13 +14,14 @@
 #include "content/public/browser/browser_message_filter.h"
 #include "webkit/appcache/appcache_backend_impl.h"
 
+namespace content {
 class ChromeAppCacheService;
 
 // Handles appcache related messages sent to the main browser process from
 // its child processes. There is a distinct host for each child process.
 // Messages are handled on the IO thread. The BrowserRenderProcessHost and
 // WorkerProcessHost create an instance and delegates calls to it.
-class AppCacheDispatcherHost : public content::BrowserMessageFilter {
+class AppCacheDispatcherHost : public BrowserMessageFilter {
  public:
   AppCacheDispatcherHost(ChromeAppCacheService* appcache_service,
                          int process_id);
@@ -33,7 +34,7 @@ class AppCacheDispatcherHost : public content::BrowserMessageFilter {
  protected:
   virtual ~AppCacheDispatcherHost();
 
-  // content::BrowserMessageFilter override.
+  // BrowserMessageFilter override.
   virtual void BadMessageReceived() OVERRIDE;
 
  private:
@@ -75,4 +76,6 @@ class AppCacheDispatcherHost : public content::BrowserMessageFilter {
   DISALLOW_COPY_AND_ASSIGN(AppCacheDispatcherHost);
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
diff --git a/content/browser/appcache/appcache_frontend_proxy.cc b/content/browser/appcache/appcache_frontend_proxy.cc
index cce4291..0ef1e32 100644
--- a/content/browser/appcache/appcache_frontend_proxy.cc
+++ b/content/browser/appcache/appcache_frontend_proxy.cc
@@ -6,6 +6,8 @@
 
 #include "content/common/appcache_messages.h"
 
+namespace content {
+
 AppCacheFrontendProxy::AppCacheFrontendProxy(IPC::Sender* sender)
     : sender_(sender) {
 }
@@ -50,3 +52,5 @@ void AppCacheFrontendProxy::OnContentBlocked(int host_id,
                                              const GURL& manifest_url) {
   sender_->Send(new AppCacheMsg_ContentBlocked(host_id, manifest_url));
 }
+
+}  // namespace content
diff --git a/content/browser/appcache/appcache_frontend_proxy.h b/content/browser/appcache/appcache_frontend_proxy.h
index 03a90ed..c5a9a78 100644
--- a/content/browser/appcache/appcache_frontend_proxy.h
+++ b/content/browser/appcache/appcache_frontend_proxy.h
@@ -11,6 +11,8 @@
 #include "ipc/ipc_sender.h"
 #include "webkit/appcache/appcache_interfaces.h"
 
+namespace content {
+
 // Sends appcache related messages to a child process.
 class AppCacheFrontendProxy : public appcache::AppCacheFrontend {
  public:
@@ -37,4 +39,6 @@ class AppCacheFrontendProxy : public appcache::AppCacheFrontend {
   IPC::Sender* sender_;
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc
index cde0484..136e520 100644
--- a/content/browser/appcache/chrome_appcache_service.cc
+++ b/content/browser/appcache/chrome_appcache_service.cc
@@ -13,7 +13,7 @@
 #include "webkit/appcache/appcache_storage_impl.h"
 #include "webkit/quota/quota_manager.h"
 
-using content::BrowserThread;
+namespace content {
 
 ChromeAppCacheService::ChromeAppCacheService(
     quota::QuotaManagerProxy* quota_manager_proxy)
@@ -23,7 +23,7 @@ ChromeAppCacheService::ChromeAppCacheService(
 
 void ChromeAppCacheService::InitializeOnIOThread(
     const FilePath& cache_path,
-    content::ResourceContext* resource_context,
+    ResourceContext* resource_context,
     net::URLRequestContextGetter* request_context_getter,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -53,14 +53,14 @@ bool ChromeAppCacheService::CanLoadAppCache(const GURL& manifest_url,
                                             const GURL& first_party) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // We don't prompt for read access.
-  return content::GetContentClient()->browser()->AllowAppCache(
+  return GetContentClient()->browser()->AllowAppCache(
       manifest_url, first_party, resource_context_);
 }
 
 bool ChromeAppCacheService::CanCreateAppCache(
     const GURL& manifest_url, const GURL& first_party) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return content::GetContentClient()->browser()->AllowAppCache(
+  return GetContentClient()->browser()->AllowAppCache(
       manifest_url, first_party, resource_context_);
 }
 
@@ -74,3 +74,5 @@ void ChromeAppCacheService::DeleteOnCorrectThread() const {
   }
   delete this;
 }
+
+}  // namespace content
diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h
index 6bc4ac2..1b7711d 100644
--- a/content/browser/appcache/chrome_appcache_service.h
+++ b/content/browser/appcache/chrome_appcache_service.h
@@ -22,7 +22,6 @@ class URLRequestContextGetter;
 
 namespace content {
 class ResourceContext;
-}
 
 struct ChromeAppCacheServiceDeleter;
 
@@ -47,7 +46,7 @@ class CONTENT_EXPORT ChromeAppCacheService
 
   void InitializeOnIOThread(
       const FilePath& cache_path,  // may be empty to use in-memory structures
-      content::ResourceContext* resource_context,
+      ResourceContext* resource_context,
       net::URLRequestContextGetter* request_context_getter,
       scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy);
 
@@ -68,7 +67,7 @@ class CONTENT_EXPORT ChromeAppCacheService
 
   void DeleteOnCorrectThread() const;
 
-  content::ResourceContext* resource_context_;
+  ResourceContext* resource_context_;
   FilePath cache_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
@@ -80,4 +79,6 @@ struct ChromeAppCacheServiceDeleter {
   }
 };
 
+}  // namespace content
+
 #endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index 70419b2..82390a6 100644
--- a/content/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -20,9 +20,9 @@
 
 #include <set>
 
-using content::BrowserThread;
-using content::BrowserThreadImpl;
+using appcache::AppCacheTestHelper;
 
+namespace content {
 namespace {
 const FilePath::CharType kTestingAppCacheDirname[] =
     FILE_PATH_LITERAL("Application Cache");
@@ -60,8 +60,6 @@ class MockURLRequestContextGetter : public net::URLRequestContextGetter {
 
 }  // namespace
 
-namespace appcache {
-
 class ChromeAppCacheServiceTest : public testing::Test {
  public:
   ChromeAppCacheServiceTest()
@@ -93,7 +91,7 @@ class ChromeAppCacheServiceTest : public testing::Test {
   BrowserThreadImpl file_user_blocking_thread_;
   BrowserThreadImpl cache_thread_;
   BrowserThreadImpl io_thread_;
-  content::TestBrowserContext browser_context_;
+  TestBrowserContext browser_context_;
 };
 
 scoped_refptr<ChromeAppCacheService>
@@ -222,4 +220,4 @@ TEST_F(ChromeAppCacheServiceTest, SaveSessionState) {
   message_loop_.RunAllPending();
 }
 
-}  // namespace appcache
+}  // namespace content