EDK: Stop having MojoCreateDataPipeOptions as a member of DataPipe.

mojo/edk/system/data_pipe.h

 // Copyright 2013 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.
 
 #ifndef MOJO_EDK_SYSTEM_DATA_PIPE_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
-#include "base/compiler_specific.h"
 #include "mojo/edk/embedder/platform_handle_vector.h"
 #include "mojo/edk/system/channel_endpoint_client.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/macros.h"
@@ skipping 144 matching lines @@
   std::unique_ptr<DataPipeImpl> ReplaceImplNoLock(
       std::unique_ptr<DataPipeImpl> new_impl)
       MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void SetProducerClosedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void SetConsumerClosedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   void ProducerCloseNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void ConsumerCloseNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   // Thread-safe and fast (they don't take |mutex_|):
-  const MojoCreateDataPipeOptions& validated_options() const {
-    return validated_options_;
+  MojoCreateDataPipeOptions validated_options() const {
+    MojoCreateDataPipeOptions rv = {sizeof(MojoCreateDataPipeOptions),
+                                    MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE,
+                                    element_num_bytes_, capacity_num_bytes_};
+    return rv;
   }
-  size_t element_num_bytes() const {
-    return validated_options_.element_num_bytes;
-  }
-  size_t capacity_num_bytes() const {
-    return validated_options_.capacity_num_bytes;
-  }
+  size_t element_num_bytes() const { return element_num_bytes_; }
+  size_t capacity_num_bytes() const { return capacity_num_bytes_; }
 
   // Must be called under |mutex_|.
   bool producer_open_no_lock() const MOJO_SHARED_LOCKS_REQUIRED(mutex_) {
     mutex_.AssertHeld();
     return producer_open_;
   }
   bool consumer_open_no_lock() const MOJO_SHARED_LOCKS_REQUIRED(mutex_) {
     mutex_.AssertHeld();
     return consumer_open_;
   }
@@ skipping 59 matching lines @@
 
   bool has_local_producer_no_lock() const MOJO_SHARED_LOCKS_REQUIRED(mutex_) {
     mutex_.AssertHeld();
     return !!producer_awakable_list_;
   }
   bool has_local_consumer_no_lock() const MOJO_SHARED_LOCKS_REQUIRED(mutex_) {
     mutex_.AssertHeld();
     return !!consumer_awakable_list_;
   }
 
-  MSVC_SUPPRESS_WARNING(4324)
-  const MojoCreateDataPipeOptions validated_options_;
+  const uint32_t element_num_bytes_;
+  const uint32_t capacity_num_bytes_;
 
   mutable util::Mutex mutex_;
   // *Known* state of producer or consumer.
   bool producer_open_ MOJO_GUARDED_BY(mutex_);
   bool consumer_open_ MOJO_GUARDED_BY(mutex_);
   // Non-null only if the producer or consumer, respectively, is local.
   std::unique_ptr<AwakableList> producer_awakable_list_ MOJO_GUARDED_BY(mutex_);
   std::unique_ptr<AwakableList> consumer_awakable_list_ MOJO_GUARDED_BY(mutex_);
   // These are nonzero if and only if a two-phase write/read is in progress.
   uint32_t producer_two_phase_max_num_bytes_written_ MOJO_GUARDED_BY(mutex_);
   uint32_t consumer_two_phase_max_num_bytes_read_ MOJO_GUARDED_BY(mutex_);
   std::unique_ptr<DataPipeImpl> impl_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(DataPipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_H_