Convert verification of options structs to use the new user pointer handling (see r285350).

mojo/system/shared_buffer_dispatcher_unittest.cc

 // Copyright 2014 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 "mojo/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 16 matching lines @@
 // |ValidateCreateOptions()| on already-validated options. The validated options
 // should be valid, and the revalidated copy should be the same.
 void RevalidateCreateOptions(
     const MojoCreateSharedBufferOptions& validated_options) {
   EXPECT_EQ(kSizeOfCreateOptions, validated_options.struct_size);
   // Nothing to check for flags.
 
   MojoCreateSharedBufferOptions revalidated_options = {};
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::ValidateCreateOptions(
-                &validated_options, &revalidated_options));
+                MakeUserPointer(&validated_options), &revalidated_options));
   EXPECT_EQ(validated_options.struct_size, revalidated_options.struct_size);
   EXPECT_EQ(validated_options.flags, revalidated_options.flags);
 }
 
 // Tests valid inputs to |ValidateCreateOptions()|.
 TEST(SharedBufferDispatcherTest, ValidateCreateOptionsValid) {
   // Default options.
   {
     MojoCreateSharedBufferOptions validated_options = {};
     EXPECT_EQ(MOJO_RESULT_OK,
               SharedBufferDispatcher::ValidateCreateOptions(
-                  NULL, &validated_options));
+                  NullUserPointer(), &validated_options));
     RevalidateCreateOptions(validated_options);
   }
 
   // Different flags.
   MojoCreateSharedBufferOptionsFlags flags_values[] = {
     MOJO_CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE
   };
   for (size_t i = 0; i < arraysize(flags_values); i++) {
     const MojoCreateSharedBufferOptionsFlags flags = flags_values[i];
 
     // Different capacities (size 1).
     for (uint32_t capacity = 1; capacity <= 100 * 1000 * 1000; capacity *= 10) {
       MojoCreateSharedBufferOptions options = {
         kSizeOfCreateOptions,  // |struct_size|.
         flags  // |flags|.
       };
       MojoCreateSharedBufferOptions validated_options = {};
       EXPECT_EQ(MOJO_RESULT_OK,
                 SharedBufferDispatcher::ValidateCreateOptions(
-                    &options, &validated_options))
+                    MakeUserPointer(&options), &validated_options))
           << capacity;
       RevalidateCreateOptions(validated_options);
       EXPECT_EQ(options.flags, validated_options.flags);
     }
   }
 }
 
 TEST(SharedBufferDispatcherTest, ValidateCreateOptionsInvalid) {
   // Invalid |struct_size|.
   {
     MojoCreateSharedBufferOptions options = {
       1,  // |struct_size|.
       MOJO_CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE  // |flags|.
     };
     MojoCreateSharedBufferOptions unused;
     EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-              SharedBufferDispatcher::ValidateCreateOptions(&options, &unused));
+              SharedBufferDispatcher::ValidateCreateOptions(
+                  MakeUserPointer(&options), &unused));
   }
 
   // Unknown |flags|.
   {
     MojoCreateSharedBufferOptions options = {
       kSizeOfCreateOptions,  // |struct_size|.
       ~0u  // |flags|.
     };
     MojoCreateSharedBufferOptions unused;
     EXPECT_EQ(MOJO_RESULT_UNIMPLEMENTED,
-              SharedBufferDispatcher::ValidateCreateOptions(&options, &unused));
+              SharedBufferDispatcher::ValidateCreateOptions(
+                  MakeUserPointer(&options), &unused));
   }
 }
 
 TEST(SharedBufferDispatcherTest, CreateAndMapBuffer) {
   scoped_refptr<SharedBufferDispatcher> dispatcher;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(
                 SharedBufferDispatcher::kDefaultCreateOptions, 100,
                 &dispatcher));
   ASSERT_TRUE(dispatcher);
@@ skipping 38 matching lines @@
   scoped_ptr<RawSharedBufferMapping> mapping;
   EXPECT_EQ(MOJO_RESULT_OK,
             dispatcher1->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE,
                                    &mapping));
   static_cast<char*>(mapping->base())[0] = 'x';
   mapping.reset();
 
   // Duplicate |dispatcher1| and then close it.
   scoped_refptr<Dispatcher> dispatcher2;
   EXPECT_EQ(MOJO_RESULT_OK,
-            dispatcher1->DuplicateBufferHandle(NULL, &dispatcher2));
+            dispatcher1->DuplicateBufferHandle(NullUserPointer(),
+                                               &dispatcher2));
   ASSERT_TRUE(dispatcher2);
   EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher2->GetType());
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
 
   // Map |dispatcher2| and read something.
   EXPECT_EQ(MOJO_RESULT_OK,
             dispatcher2->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE,
                                    &mapping));
   EXPECT_EQ('x', static_cast<char*>(mapping->base())[0]);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
 }
 
 TEST(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsValid) {
   scoped_refptr<SharedBufferDispatcher> dispatcher1;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(
                 SharedBufferDispatcher::kDefaultCreateOptions, 100,
                 &dispatcher1));
 
   MojoDuplicateBufferHandleOptions options[] = {
     {sizeof(MojoDuplicateBufferHandleOptions),
      MOJO_DUPLICATE_BUFFER_HANDLE_OPTIONS_FLAG_NONE},
     {sizeof(MojoDuplicateBufferHandleOptionsFlags), ~0u}
   };
   for (size_t i = 0; i < arraysize(options); i++) {
     scoped_refptr<Dispatcher> dispatcher2;
     EXPECT_EQ(MOJO_RESULT_OK,
-              dispatcher1->DuplicateBufferHandle(&options[i], &dispatcher2));
+              dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options[i]),
+                                                 &dispatcher2));
     ASSERT_TRUE(dispatcher2);
     EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher2->GetType());
     EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
   }
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
 }
 
 TEST(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsInvalid) {
   scoped_refptr<SharedBufferDispatcher> dispatcher1;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(
                 SharedBufferDispatcher::kDefaultCreateOptions, 100,
                 &dispatcher1));
 
   // Invalid |struct_size|.
   {
     MojoDuplicateBufferHandleOptions options = {
       1u, MOJO_DUPLICATE_BUFFER_HANDLE_OPTIONS_FLAG_NONE
     };
     scoped_refptr<Dispatcher> dispatcher2;
     EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-              dispatcher1->DuplicateBufferHandle(&options, &dispatcher2));
+              dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options),
+                                                 &dispatcher2));
     EXPECT_FALSE(dispatcher2);
   }
 
   // Unknown |flags|.
   {
     MojoDuplicateBufferHandleOptions options = {
       sizeof(MojoDuplicateBufferHandleOptions), ~0u
     };
     scoped_refptr<Dispatcher> dispatcher2;
     EXPECT_EQ(MOJO_RESULT_UNIMPLEMENTED,
-              dispatcher1->DuplicateBufferHandle(&options, &dispatcher2));
+              dispatcher1->DuplicateBufferHandle(MakeUserPointer(&options),
+                                                 &dispatcher2));
     EXPECT_FALSE(dispatcher2);
   }
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
 }
 
 TEST(SharedBufferDispatcherTest, CreateInvalidNumBytes) {
   // Size too big.
   scoped_refptr<SharedBufferDispatcher> dispatcher;
   EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED,
@@ skipping 28 matching lines @@
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher->MapBuffer(0, 0, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo