Rename IPC::ChannelFactory to ChannelHandleAcceptor.

apps/app_shim/app_shim_host_manager_mac.mm

 // 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 "apps/app_shim/app_shim_host_manager_mac.h"
 
 #include <unistd.h>
 
 #include "apps/app_shim/app_shim_handler_mac.h"
 #include "apps/app_shim/app_shim_host_mac.h"
@@ skipping 46 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!did_init_);
   did_init_ = true;
   apps::AppShimHandler::SetDefaultHandler(&extension_app_shim_handler_);
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&AppShimHostManager::InitOnFileThread, this));
 }
 
 AppShimHostManager::~AppShimHostManager() {
-  factory_.reset();
+  acceptor_.reset();
   if (!did_init_)
     return;
 
   apps::AppShimHandler::SetDefaultHandler(NULL);
   base::FilePath symlink_path;
   if (PathService::Get(chrome::DIR_USER_DATA, &symlink_path))
     symlink_path = symlink_path.Append(app_mode::kAppShimSocketSymlinkName);
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
@@ skipping 20 matching lines @@
 
   directory_in_tmp_ = base::FilePath(directory_string);
   // Check that the directory was created with the correct permissions.
   int dir_mode = 0;
   if (!base::GetPosixFilePermissions(directory_in_tmp_, &dir_mode) ||
       dir_mode != base::FILE_PERMISSION_USER_MASK) {
     NOTREACHED();
     return;
   }
 
-  // IPC::ChannelFactory creates the socket immediately.
+  // UnixDomainSocketAcceptor creates the socket immediately.
   base::FilePath socket_path =
       directory_in_tmp_.Append(app_mode::kAppShimSocketShortName);
-  factory_.reset(new IPC::ChannelFactory(socket_path, this));
+  acceptor_.reset(new apps::UnixDomainSocketAcceptor(socket_path, this));
 
   // Create a symlink to the socket in the user data dir. This lets the shim
   // process started from Finder find the actual socket path by following the
   // symlink with ::readlink().
   base::FilePath symlink_path =
       user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
   base::DeleteFile(symlink_path, false);
   base::CreateSymbolicLink(socket_path, symlink_path);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&AppShimHostManager::ListenOnIOThread, this));
 }
 
 void AppShimHostManager::ListenOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (!factory_->Listen()) {
+  if (!acceptor_->Listen()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&AppShimHostManager::OnListenError, this));
   }
 }
 
 void AppShimHostManager::OnClientConnected(
     const IPC::ChannelHandle& handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CreateAppShimHost, handle));
 }
 
 void AppShimHostManager::OnListenError() {
   // TODO(tapted): Set a timeout and attempt to reconstruct the channel. Until
-  // cases where the error could occur are better known, just reset the factory
+  // cases where the error could occur are better known, just reset the acceptor
   // to allow failure to be communicated via the test API.
-  factory_.reset();
+  acceptor_.reset();
 }