Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819

third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc

Index: third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
index 2be4f6ea4ff0de413e2097daddcfb219cc4af830..524129329db292b331e1361e0ffae7c6d05a86c9 100644
--- a/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/system/unique_identifier_unittest.cc
@@ -8,21 +8,36 @@
 #include <sstream>
 
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
+#include "mojo/edk/embedder/simple_platform_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
-TEST(UniqueIdentifierTest, Basic) {
+class UniqueIdentifierTest : public testing::Test {
+ public:
+  UniqueIdentifierTest() {}
+  ~UniqueIdentifierTest() override {}
+
+  embedder::PlatformSupport* platform_support() { return &platform_support_; }
+
+ private:
+  embedder::SimplePlatformSupport platform_support_;
+
+  DISALLOW_COPY_AND_ASSIGN(UniqueIdentifierTest);
+};
+
+TEST_F(UniqueIdentifierTest, Basic) {
   // (This also checks copy constructibility.)
-  UniqueIdentifier id1 = UniqueIdentifier::Generate();
+  UniqueIdentifier id1 = UniqueIdentifier::Generate(platform_support());
 
   EXPECT_EQ(id1, id1);
   EXPECT_FALSE(id1 != id1);
   EXPECT_FALSE(id1 < id1);
 
-  UniqueIdentifier id2 = UniqueIdentifier::Generate();
+  UniqueIdentifier id2 = UniqueIdentifier::Generate(platform_support());
 
   EXPECT_FALSE(id2 == id1);
   EXPECT_NE(id2, id1);
@@ -32,14 +47,14 @@ TEST(UniqueIdentifierTest, Basic) {
   id2 = id1;
 }
 
-TEST(UniqueIdentifierTest, Logging) {
+TEST_F(UniqueIdentifierTest, Logging) {
   std::ostringstream oss1;
-  UniqueIdentifier id1 = UniqueIdentifier::Generate();
+  UniqueIdentifier id1 = UniqueIdentifier::Generate(platform_support());
   oss1 << id1;
   EXPECT_FALSE(oss1.str().empty());
 
   std::ostringstream oss2;
-  UniqueIdentifier id2 = UniqueIdentifier::Generate();
+  UniqueIdentifier id2 = UniqueIdentifier::Generate(platform_support());
   oss2 << id2;
   EXPECT_FALSE(oss2.str().empty());
 
@@ -47,17 +62,17 @@ TEST(UniqueIdentifierTest, Logging) {
   EXPECT_NE(oss1.str(), oss2.str());
 }
 
-TEST(UniqueIdentifierTest, StdSet) {
+TEST_F(UniqueIdentifierTest, StdSet) {
   std::set<UniqueIdentifier> s;
   EXPECT_TRUE(s.empty());
 
-  UniqueIdentifier id1 = UniqueIdentifier::Generate();
+  UniqueIdentifier id1 = UniqueIdentifier::Generate(platform_support());
   EXPECT_TRUE(s.find(id1) == s.end());
   s.insert(id1);
   EXPECT_TRUE(s.find(id1) != s.end());
   EXPECT_FALSE(s.empty());
 
-  UniqueIdentifier id2 = UniqueIdentifier::Generate();
+  UniqueIdentifier id2 = UniqueIdentifier::Generate(platform_support());
   EXPECT_TRUE(s.find(id2) == s.end());
   s.insert(id2);
   EXPECT_TRUE(s.find(id2) != s.end());
@@ -74,17 +89,17 @@ TEST(UniqueIdentifierTest, StdSet) {
   EXPECT_TRUE(s.empty());
 }
 
-TEST(UniqueIdentifierTest, HashSet) {
+TEST_F(UniqueIdentifierTest, HashSet) {
   base::hash_set<UniqueIdentifier> s;
   EXPECT_TRUE(s.empty());
 
-  UniqueIdentifier id1 = UniqueIdentifier::Generate();
+  UniqueIdentifier id1 = UniqueIdentifier::Generate(platform_support());
   EXPECT_TRUE(s.find(id1) == s.end());
   s.insert(id1);
   EXPECT_TRUE(s.find(id1) != s.end());
   EXPECT_FALSE(s.empty());
 
-  UniqueIdentifier id2 = UniqueIdentifier::Generate();
+  UniqueIdentifier id2 = UniqueIdentifier::Generate(platform_support());
   EXPECT_TRUE(s.find(id2) == s.end());
   s.insert(id2);
   EXPECT_TRUE(s.find(id2) != s.end());