win: Fixes for minidump_misc_info_writer_test.cc

snapshot/test/test_process_snapshot.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #ifndef CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_
 #define CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_
 
 #include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "snapshot/exception_snapshot.h"
+#include "snapshot/module_snapshot.h"

[Mark Mentovai, 2015/02/05 14:48:36]

You can remove the #includes for module_snapshot.h and thread_snapshot.h from
test_process_snapshot.cc, since they’re in this file now.

[scottmg, 2015/02/05 17:24:52]

Done.

 #include "snapshot/process_snapshot.h"
 #include "snapshot/system_snapshot.h"
+#include "snapshot/thread_snapshot.h"
 #include "util/stdlib/pointer_container.h"
 
 namespace crashpad {
 

[Mark Mentovai, 2015/02/05 14:48:36]

You can get rid of this blank line too, since there’s no longer any intervening
stuff in this file that’s in crashpad but not crashpad::test.

[scottmg, 2015/02/05 17:24:52]

Done.

-class ModuleSnapshot;
-class ThreadSnapshot;
-
 namespace test {
 
 //! \brief A test ProcessSnapshot that can carry arbitrary data for testing
 //!     purposes.
 class TestProcessSnapshot final : public ProcessSnapshot {
  public:
   TestProcessSnapshot();
   ~TestProcessSnapshot() override;
 
   void SetProcessID(pid_t process_id) { process_id_ = process_id; }
@@ skipping 15 matching lines @@
   //! \brief Sets the system snapshot to be returned by System().
   //!
   //! \param[in] system The system snapshot that System() will return. The
   //!     TestProcessSnapshot object takes ownership of \a system.
   void SetSystem(scoped_ptr<SystemSnapshot> system) { system_ = system.Pass(); }
 
   //! \brief Adds a thread snapshot to be returned by Threads().
   //!
   //! \param[in] thread The thread snapshot that will be included in Threads().
   //!     The TestProcessSnapshot object takes ownership of \a thread.
   void AddThread(scoped_ptr<ThreadSnapshot> thread) {

[Mark Mentovai, 2015/02/05 14:48:36]

These scoped_ptr<> arguments are why the forward declarations weren’t enough.

[scottmg, 2015/02/05 17:24:52]

Right. I noticed the members and out-of-line destructor, but missed the
arguments here.

     threads_.push_back(thread.release());
   }
 
   //! \brief Adds a module snapshot to be returned by Modules().
   //!
   //! \param[in] module The module snapshot that will be included in Modules().
   //!     The TestProcessSnapshot object takes ownership of \a module.
   void AddModule(scoped_ptr<ModuleSnapshot> module) {
     modules_.push_back(module.release());
   }
@@ skipping 30 matching lines @@
   PointerVector<ModuleSnapshot> modules_;
   scoped_ptr<ExceptionSnapshot> exception_;
 
   DISALLOW_COPY_AND_ASSIGN(TestProcessSnapshot);
 };
 
 }  // namespace test
 }  // namespace crashpad
 
 #endif  // CRASHPAD_SNAPSHOT_TEST_TEST_PROCESS_SNAPSHOT_H_