Mojo: Make default Options directly accessible.

mojo/system/shared_buffer_dispatcher.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/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/c/system/macros.h"
 #include "mojo/system/constants.h"
 #include "mojo/system/memory.h"
 #include "mojo/system/options_validation.h"
 #include "mojo/system/raw_shared_buffer.h"
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 struct SerializedSharedBufferDispatcher {
   size_t num_bytes;
   size_t platform_handle_index;
 };
 
 }  // namespace
 
 // static
+const MojoCreateSharedBufferOptions
+    SharedBufferDispatcher::kDefaultCreateOptions = {
+  static_cast<uint32_t>(sizeof(MojoCreateSharedBufferOptions)),
+  MOJO_CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE
+};
+
+// static
 MojoResult SharedBufferDispatcher::ValidateCreateOptions(
     const MojoCreateSharedBufferOptions* in_options,
     MojoCreateSharedBufferOptions* out_options) {
   const MojoCreateSharedBufferOptionsFlags kKnownFlags =
       MOJO_CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE;
-  static const MojoCreateSharedBufferOptions kDefaultOptions = {
-    static_cast<uint32_t>(sizeof(MojoCreateSharedBufferOptions)),
-    MOJO_CREATE_SHARED_BUFFER_OPTIONS_FLAG_NONE
-  };
 
-  *out_options = kDefaultOptions;
+  *out_options = kDefaultCreateOptions;
   if (!in_options)
     return MOJO_RESULT_OK;
 
   MojoResult result =
       ValidateOptionsStructPointerSizeAndFlags<MojoCreateSharedBufferOptions>(
           in_options, kKnownFlags, out_options);
   if (result != MOJO_RESULT_OK)
     return result;
 
   // Checks for fields beyond |flags|:
@@ skipping 214 matching lines @@
   return MOJO_WAIT_FLAG_NONE;
 }
 
 MojoWaitFlags SharedBufferDispatcher::SatisfiableFlagsNoLock() const {
   // TODO(vtl): Add transferrable flag.
   return MOJO_WAIT_FLAG_NONE;
 }
 
 }  // namespace system
 }  // namespace mojo