Mojo: Delete GenerateRandomToken()

There's no reason for Mojo to provide this API.

Bug: 844763
Change-Id: I32e9e92f82e55564273961f3f59dd15677125e81
Reviewed-on: https://chromium-review.googlesource.com/1086035Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Reviewed-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Jay Civelli <jcivelli@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565088}

components/arc/arc_session_impl.cc

@@ -26,7 +26,6 @@
 #include "components/arc/arc_bridge_host_impl.h"
 #include "components/arc/arc_features.h"
 #include "components/user_manager/user_manager.h"
-#include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_utils_posix.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -49,6 +48,12 @@ chromeos::SessionManagerClient* GetSessionManagerClient() {
   return chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
 }
 
+std::string GenerateRandomToken() {
+  char random_bytes[16];
+  base::RandBytes(random_bytes, 16);
+  return base::HexEncode(random_bytes, 16);
+}
+
 // Creates a pipe. Returns true on success, otherwise false.
 // On success, |read_fd| will be set to the fd of the read side, and
 // |write_fd| will be set to the one of write side.
@@ -182,7 +187,7 @@ mojo::ScopedMessagePipeHandle ArcSessionDelegateImpl::ConnectMojoInternal(
   mojo::OutgoingInvitation invitation;
   // Generate an arbitrary 32-byte string. ARC uses this length as a protocol
   // version identifier.
-  std::string token = mojo::edk::GenerateRandomToken();
+  std::string token = GenerateRandomToken();
   mojo::ScopedMessagePipeHandle pipe = invitation.AttachMessagePipe(token);
   mojo::OutgoingInvitation::Send(std::move(invitation),
                                  base::kNullProcessHandle,

media/capture/video/chromeos/camera_hal_dispatcher_impl.cc

@@ -18,7 +18,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
-#include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_utils_posix.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/platform/named_platform_channel.h"
@@ -33,6 +32,12 @@ const base::FilePath::CharType kArcCamera3SocketPath[] =
     "/var/run/camera/camera3.sock";
 const char kArcCameraGroup[] = "arc-camera";
 
+std::string GenerateRandomToken() {
+  char random_bytes[16];
+  base::RandBytes(random_bytes, 16);
+  return base::HexEncode(random_bytes, 16);
+}
+
 // Creates a pipe. Returns true on success, otherwise false.
 // On success, |read_fd| will be set to the fd of the read side, and
 // |write_fd| will be set to the one of write side.
@@ -293,7 +298,7 @@ void CameraHalDispatcherImpl::StartServiceLoop(base::ScopedFD socket_fd,
 
       // Generate an arbitrary 32-byte string, as we use this length as a
       // protocol version identifier.
-      std::string token = mojo::edk::GenerateRandomToken();
+      std::string token = GenerateRandomToken();
       mojo::ScopedMessagePipeHandle pipe = invitation.AttachMessagePipe(token);
       mojo::OutgoingInvitation::Send(std::move(invitation),
                                      kUnusedChildProcessHandle,

mojo/edk/BUILD.gn

@@ -22,11 +22,6 @@ component("edk") {
 
   defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ]
 
-  deps = []
-  if (!is_nacl) {
-    deps += [ "//crypto" ]
-  }
-
   public_deps = [
     ":impl_for_edk",
     "//mojo/public/cpp/platform",

mojo/edk/embedder/embedder.cc

@@ -10,8 +10,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/rand_util.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "mojo/edk/embedder/entrypoints.h"
 #include "mojo/edk/system/configuration.h"
@@ -19,10 +17,6 @@
 #include "mojo/edk/system/node_controller.h"
 #include "mojo/public/c/system/thunks.h"
 
-#if !defined(OS_NACL)
-#include "crypto/random.h"
-#endif
-
 namespace mojo {
 namespace edk {
 
@@ -40,17 +34,6 @@ void SetDefaultProcessErrorCallback(const ProcessErrorCallback& callback) {
   Core::Get()->SetDefaultProcessErrorCallback(callback);
 }
 
-std::string GenerateRandomToken() {
-  char random_bytes[16];
-#if defined(OS_NACL)
-  // Not secure. For NaCl only!
-  base::RandBytes(random_bytes, 16);
-#else
-  crypto::RandBytes(random_bytes, 16);
-#endif
-  return base::HexEncode(random_bytes, 16);
-}
-
 MojoResult CreateInternalPlatformHandleWrapper(
     ScopedInternalPlatformHandle platform_handle,
     MojoHandle* platform_handle_wrapper_handle) {

mojo/edk/embedder/embedder.h

@@ -44,10 +44,6 @@ MOJO_SYSTEM_IMPL_EXPORT void Init();
 MOJO_SYSTEM_IMPL_EXPORT void SetDefaultProcessErrorCallback(
     const ProcessErrorCallback& callback);
 
-// Generates a random ASCII token string for use with various APIs that expect
-// a globally unique token string. May be called at any time on any thread.
-MOJO_SYSTEM_IMPL_EXPORT std::string GenerateRandomToken();
-
 // Basic functions -------------------------------------------------------------
 //
 // The functions in this section are available once |Init()| has been called and

mojo/edk/embedder/embedder_unittest.cc

@@ -22,7 +22,9 @@
 #include "base/memory/writable_shared_memory_region.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
+#include "base/rand_util.h"
 #include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
@@ -446,13 +448,13 @@ DEFINE_TEST_CLIENT_TEST_WITH_PIPE(MultiprocessMixMachAndFdsClient,
 // TODO(fuchsia): Implement NamedPlatformHandles (crbug.com/754038).
 
 NamedPlatformHandle GenerateChannelName() {
+  std::string token = base::NumberToString(base::RandUint64());
 #if defined(OS_POSIX)
   base::FilePath temp_dir;
   CHECK(base::PathService::Get(base::DIR_TEMP, &temp_dir));
-  return NamedPlatformHandle(
-      temp_dir.AppendASCII(GenerateRandomToken()).value());
+  return NamedPlatformHandle(temp_dir.AppendASCII(token).value());
 #else
-  return NamedPlatformHandle(GenerateRandomToken());
+  return NamedPlatformHandle(token);
 #endif
 }
 
@@ -463,7 +465,7 @@ void CreateClientHandleOnIoThread(const NamedPlatformHandle& named_handle,
 
 TEST_F(EmbedderTest, ClosePendingPeerConnection) {
   NamedPlatformHandle named_handle = GenerateChannelName();
-  std::string peer_token = GenerateRandomToken();
+  std::string peer_token = base::NumberToString(base::RandUint64());
 
   auto peer_connection = std::make_unique<PeerConnection>();
   ScopedMessagePipeHandle server_pipe =

mojo/edk/test/multiprocess_test_helper.cc

@@ -148,7 +148,8 @@ ScopedMessagePipeHandle MultiprocessTestHelper::StartChildWithExtraSwitch(
 #elif defined(OS_POSIX)
     base::FilePath temp_dir;
     CHECK(base::PathService::Get(base::DIR_TEMP, &temp_dir));
-    server_name = temp_dir.AppendASCII(GenerateRandomToken()).value();
+    server_name =
+        temp_dir.AppendASCII(base::NumberToString(base::RandUint64())).value();
 #elif defined(OS_WIN)
     server_name = base::NumberToString16(base::RandUint64());
 #else