Revert of Replaced cc::SurfaceId::nonce_ with base::UnguessableToken

cc/ipc/cc_param_traits.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 "cc/ipc/cc_param_traits.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/numerics/safe_conversions.h"
 #include "base/time/time.h"
-#include "base/unguessable_token.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/largest_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
@@ skipping 592 matching lines @@
   WriteParam(m, p.nonce());
 }
 
 bool ParamTraits<cc::LocalFrameId>::Read(const base::Pickle* m,
                                          base::PickleIterator* iter,
                                          param_type* p) {
   uint32_t local_id;
   if (!ReadParam(m, iter, &local_id))
     return false;
 
-  base::UnguessableToken nonce;
+  uint64_t nonce;
   if (!ReadParam(m, iter, &nonce))
     return false;
 
   *p = cc::LocalFrameId(local_id, nonce);
   return true;
 }
 
 void ParamTraits<cc::LocalFrameId>::Log(const param_type& p, std::string* l) {
   l->append("LocalFrameId(");
   LogParam(p.local_id(), l);
@@ skipping 336 matching lines @@
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC