ipc: Clean up interface of attachment broker.

ipc/ipc_channel.cc

 // Copyright (c) 2012 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 "ipc/ipc_channel.h"
 
+#if !defined(OS_NACL_SFI)
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
+#endif  // !defined(OS_NACL_SFI)

[Tom Sepez, 2015/07/30 00:35:47]

nit: maybe combine this with line 15

[erikchen, 2015/07/30 01:38:19]

Moving the constructor to the header means these changes are no longer
necessary.

 
+#if !defined(OS_NACL_SFI)
 namespace {
 
 // Global atomic used to guarantee channel IDs are unique.
 base::StaticAtomicSequenceNumber g_last_id;
 
 }  // namespace
+#endif  // !defined(OS_NACL_SFI)
 
 namespace IPC {
 
+Channel::Channel() : attachment_broker_endpoint_(false) {}

[Tom Sepez, 2015/07/30 00:35:47]

Hmm.  If this were in the header, could we avoid the gyp/GN changes?

[erikchen, 2015/07/30 01:38:19]

Good suggestion! Done.

+
+#if !defined(OS_NACL_SFI)
 // static
 std::string Channel::GenerateUniqueRandomChannelID() {
   // Note: the string must start with the current process id, this is how
   // some child processes determine the pid of the parent.
   //
   // This is composed of a unique incremental identifier, the process ID of
   // the creator, an identifier for the child instance, and a strong random
   // component. The strong random component prevents other processes from
   // hijacking or squatting on predictable channel names.
 #if defined(OS_NACL_NONSFI)
   // The seccomp sandbox disallows use of getpid(), so we provide a
   // dummy PID.
   int process_id = -1;
 #else
   int process_id = base::GetCurrentProcId();
 #endif
   return base::StringPrintf("%d.%u.%d",
       process_id,
       g_last_id.GetNext(),
       base::RandInt(0, std::numeric_limits<int32>::max()));
 }
+#endif  // !defined(OS_NACL_SFI)
 
 }  // namespace IPC