EDK: Move {platform_handle,scoped_platform_handle}.* to //mojo/edk/platform.

mojo/edk/system/master_connection_manager.cc

 // Copyright 2015 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 "mojo/edk/system/master_connection_manager.h"
 
 #include <memory>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/master_process_delegate.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/edk/platform/platform_handle.h"
+#include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/system/connection_manager_messages.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/raw_channel.h"
 #include "mojo/edk/system/transport_data.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/edk/util/waitable_event.h"
 #include "mojo/public/cpp/system/macros.h"
 
-using mojo::embedder::ScopedPlatformHandle;
+using mojo::platform::PlatformHandle;
+using mojo::platform::ScopedPlatformHandle;
 using mojo::platform::TaskRunner;
 using mojo::util::AutoResetWaitableEvent;
 using mojo::util::MakeUnique;
 using mojo::util::MutexLocker;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 
 namespace {
@@ skipping 246 matching lines @@
     DCHECK(!pending_platform_handle || !pending_platform_handle->is_valid());
 
     auto it = process_connections_.find(to_process_identifier);
     if (it == process_connections_.end())
       return ConnectionStatus::NONE;
     if (!it->second.is_valid())
       return ConnectionStatus::RUNNING;
     // Pending:
     if (pending_platform_handle) {
       pending_platform_handle->reset(it->second);
-      it->second = embedder::PlatformHandle();
+      it->second = PlatformHandle();
     }
     return ConnectionStatus::PENDING;
   }
 
   void AddConnection(ProcessIdentifier to_process_identifier,
                      ConnectionStatus status,
                      ScopedPlatformHandle pending_platform_handle) {
     DCHECK(process_connections_.find(to_process_identifier) ==
            process_connections_.end());
 
     if (status == ConnectionStatus::RUNNING) {
       DCHECK(!pending_platform_handle.is_valid());
-      process_connections_[to_process_identifier] = embedder::PlatformHandle();
+      process_connections_[to_process_identifier] = PlatformHandle();
     } else if (status == ConnectionStatus::PENDING) {
       DCHECK(pending_platform_handle.is_valid());
       process_connections_[to_process_identifier] =
           pending_platform_handle.release();
     } else {
       NOTREACHED();
     }
   }
 
  private:
   // TODO(vtl): Make |second| |ScopedPlatformHandle|s.
-  std::unordered_map<ProcessIdentifier, embedder::PlatformHandle>
+  std::unordered_map<ProcessIdentifier, PlatformHandle>
       process_connections_;  // "Owns" any valid platform handles.
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ProcessConnections);
 };
 
 // MasterConnectionManager -----------------------------------------------------
 
 MasterConnectionManager::MasterConnectionManager(
     embedder::PlatformSupport* platform_support)
     : ConnectionManager(platform_support),
@@ skipping 411 matching lines @@
 }
 
 void MasterConnectionManager::AssertOnPrivateThread() const {
   // This should only be called after |Init()| and before |Shutdown()|.
   DCHECK(private_thread_.message_loop());
   DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop());
 }
 
 }  // namespace system
 }  // namespace mojo