Revert 164120 - content/browser: Move more files into the content namespace.

content/browser/mach_broker_mac.cc

 // Copyright (c) 2011 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/mach_broker_mac.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mach_ipc_mac.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
-namespace content {
+using content::BrowserThread;
 
 namespace {
-
 // Prints a string representation of a Mach error code.
 std::string MachErrorCode(kern_return_t err) {
   return base::StringPrintf("0x%x %s", err, mach_error_string(err));
 }
-
 }  // namespace
 
 class MachListenerThreadDelegate : public base::PlatformThread::Delegate {
  public:
   MachListenerThreadDelegate(MachBroker* broker) : broker_(broker) {
     DCHECK(broker_);
     std::string port_name = MachBroker::GetMachPortName();
 
     // Create the receive port in the constructor, not in ThreadMain().  It is
     // important to create and register the receive port before starting the
@@ skipping 125 matching lines @@
 // Returns the mach task belonging to |pid|.
 mach_port_t MachBroker::TaskForPid(base::ProcessHandle pid) const {
   base::AutoLock lock(lock_);
   MachBroker::MachMap::const_iterator it = mach_map_.find(pid);
   if (it == mach_map_.end())
     return MACH_PORT_NULL;
   return it->second.mach_task_;
 }
 
 void MachBroker::Observe(int type,
-                         const NotificationSource& source,
-                         const NotificationDetails& details) {
+                         const content::NotificationSource& source,
+                         const content::NotificationDetails& details) {
   // TODO(rohitrao): These notifications do not always carry the proper PIDs,
   // especially when the renderer is already gone or has crashed.  Find a better
   // way to listen for child process deaths.  http://crbug.com/55734
   base::ProcessHandle handle = 0;
   switch (type) {
-    case NOTIFICATION_RENDERER_PROCESS_CLOSED:
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED:
       handle =
-          Details<RenderProcessHost::RendererClosedDetails>(
+          content::Details<content::RenderProcessHost::RendererClosedDetails>(
               details)->handle;
       break;
-    case NOTIFICATION_RENDERER_PROCESS_TERMINATED:
-      handle = Source<RenderProcessHost>(source)->GetHandle();
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
+      handle = content::Source<content::RenderProcessHost>(source)->
+          GetHandle();
       break;
-    case NOTIFICATION_CHILD_PROCESS_CRASHED:
-    case NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED:
-      handle = Details<ChildProcessData>(details)->handle;
+    case content::NOTIFICATION_CHILD_PROCESS_CRASHED:
+    case content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED:
+      handle = content::Details<content::ChildProcessData>(details)->handle;
       break;
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
   InvalidatePid(handle);
 }
 
 // static
 std::string MachBroker::GetMachPortName() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   const bool is_child = command_line->HasSwitch(switches::kProcessType);
 
   // In non-browser (child) processes, use the parent's pid.
   const pid_t pid = is_child ? getppid() : getpid();
   return base::StringPrintf("%s.rohitfork.%d", base::mac::BaseBundleID(), pid);
 }
 
 MachBroker::MachBroker() : listener_thread_started_(false) {
 }
 
 MachBroker::~MachBroker() {}
 
 void MachBroker::RegisterNotifications() {
-  registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                 NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-                 NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, NOTIFICATION_CHILD_PROCESS_CRASHED,
-                 NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED,
-                 NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_CHILD_PROCESS_CRASHED,
+                 content::NotificationService::AllBrowserContextsAndSources());
+  registrar_.Add(this, content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED,
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
-
-}  // namespace content