Remove base/mac/mach_ipc_mac.{h,mm}.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright 2013 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 141 matching lines @@
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/policy_service.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 #if defined(OS_MACOSX)
-#include "base/mach_ipc_mac.h"
+#include <mach/mach.h>
 #endif
 
 #if !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif  // !defined(NO_TCMALLOC) && (defined(OS_LINUX) || defined(OS_CHROMEOS))
 
 using automation::Error;
 using automation::ErrorCode;
 using automation_util::SendErrorIfModalDialogActive;
 using content::BrowserChildProcessHostIterator;
@@ skipping 310 matching lines @@
       delete observer;
 
     AutomationMsg_AppendTab::WriteReplyParams(reply_message,
                                               append_tab_response);
     Send(reply_message);
   }
 }
 
 void TestingAutomationProvider::GetMachPortCount(int* port_count) {
 #if defined(OS_MACOSX)
-  base::mac::GetNumberOfMachPorts(mach_task_self(), port_count);
+  mach_port_name_array_t names;
+  mach_msg_type_number_t names_count;
+  mach_port_type_array_t types;
+  mach_msg_type_number_t types_count;
+
+  // A friendlier interface would allow NULL buffers to only get the counts.
+  kern_return_t kr = mach_port_names(mach_task_self(), &names, &names_count,

[Mark Mentovai, 2013/04/11 17:02:56]

local for mach_task_self() (yeah, even though…)

[Robert Sesek, 2013/04/11 17:10:32]

Done.

+                                     &types, &types_count);
+  if (kr != KERN_SUCCESS) {
+    *port_count = -1;

[Mark Mentovai, 2013/04/11 17:02:56]

-1 for failure on Mac but 0 for “not implemented” on other platforms?

[Robert Sesek, 2013/04/11 17:10:32]

Done.

+    return;
+  }
+
+  // The documentation states this is an invariant.
+  DCHECK_EQ(names_count, types_count);
+  *port_count = names_count;
+
+  vm_deallocate(mach_task_self(),

[Mark Mentovai, 2013/04/11 17:02:56]

For 64-bit compatibility, use mach_vm_deallocate instead of vm_deallocate, and
use mach_vm_address_t instead of vm_address_t.

[Robert Sesek, 2013/04/11 17:10:32]

Done.

+      reinterpret_cast<vm_address_t>(names),
+      names_count * sizeof(mach_port_name_array_t));
+  vm_deallocate(mach_task_self(),
+      reinterpret_cast<vm_address_t>(types),
+      types_count * sizeof(mach_port_type_array_t));
+
 #else
   *port_count = 0;
 #endif
 }
 
 void TestingAutomationProvider::GetActiveTabIndex(int handle,
                                                   int* active_tab_index) {
   *active_tab_index = -1;  // -1 is the error code
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
@@ skipping 5418 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }