Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/media/router/media_router_mojo_impl_unittest.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 <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/histogram_tester.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_router_metrics.h"
 #include "chrome/browser/media/router/media_router_mojo_test.h"
 #include "chrome/browser/media/router/media_router_type_converters.h"
@@ skipping 33 matching lines @@
 const char kSource[] = "source1";
 const char kSource2[] = "source2";
 const char kRouteId[] = "routeId";
 const char kRouteId2[] = "routeId2";
 const char kSinkId[] = "sink";
 const char kSinkId2[] = "sink2";
 const char kSinkName[] = "sinkName";
 const char kPresentationId[] = "presentationId";
 const char kOrigin[] = "http://origin/";
 const int kInvalidTabId = -1;
-const uint8 kBinaryMessage[] = {0x01, 0x02, 0x03, 0x04};
+const uint8_t kBinaryMessage[] = {0x01, 0x02, 0x03, 0x04};
 
 bool ArePresentationSessionMessagesEqual(
     const content::PresentationSessionMessage* expected,
     const content::PresentationSessionMessage* actual) {
   if (expected->type != actual->type)
     return false;
 
   return expected->is_binary() ? *expected->data == *actual->data
                                : expected->message == actual->message;
 }
@@ skipping 494 matching lines @@
 
   SendMessageCallbackHandler handler;
   EXPECT_CALL(handler, Invoke(true));
   router()->SendRouteMessage(kRouteId, kMessage,
                              base::Bind(&SendMessageCallbackHandler::Invoke,
                                         base::Unretained(&handler)));
   ProcessEventLoop();
 }
 
 TEST_F(MediaRouterMojoImplTest, SendRouteBinaryMessage) {
-  scoped_ptr<std::vector<uint8>> expected_binary_data(new std::vector<uint8>(
-      kBinaryMessage, kBinaryMessage + arraysize(kBinaryMessage)));
+  scoped_ptr<std::vector<uint8_t>> expected_binary_data(
+      new std::vector<uint8_t>(kBinaryMessage,
+                               kBinaryMessage + arraysize(kBinaryMessage)));
 
   EXPECT_CALL(mock_media_route_provider_,
               SendRouteBinaryMessageInternal(mojo::String(kRouteId), _, _))
       .WillOnce(Invoke([](
-          const MediaRoute::Id& route_id, const std::vector<uint8>& data,
+          const MediaRoute::Id& route_id, const std::vector<uint8_t>& data,
           const interfaces::MediaRouteProvider::SendRouteMessageCallback& cb) {
         EXPECT_EQ(
             0, memcmp(kBinaryMessage, &(data[0]), arraysize(kBinaryMessage)));
         cb.Run(true);
       }));
 
   SendMessageCallbackHandler handler;
   EXPECT_CALL(handler, Invoke(true));
   router()->SendRouteBinaryMessage(
       kRouteId, expected_binary_data.Pass(),
@@ skipping 472 matching lines @@
   EXPECT_CALL(provide_handler_, Invoke(testing::Not("")));
   EXPECT_CALL(*process_manager_, IsEventPageSuspended(kExtensionId))
       .WillOnce(Return(false));
   EXPECT_CALL(mock_media_route_provider_, DetachRoute(mojo::String(kRouteId2)))
       .Times(kMaxPendingRequests);
   RegisterMediaRouteProvider();
   ProcessEventLoop();
 }
 
 }  // namespace media_router