Update monet.

mojo/message_pump/handle_watcher_unittest.cc

 // 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.
 
-#include "mojo/common/handle_watcher.h"
+#include "mojo/message_pump/handle_watcher.h"
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/threading/thread.h"
-#include "mojo/common/message_pump_mojo.h"
-#include "mojo/common/time_helper.h"
+#include "mojo/message_pump/message_pump_mojo.h"
+#include "mojo/message_pump/time_helper.h"
+#include "mojo/public/cpp/system/message_pipe.h"
+#include "mojo/public/cpp/test_support/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/core.h"
-#include "third_party/mojo/src/mojo/public/cpp/test_support/test_utils.h"
 
 namespace mojo {
 namespace common {
 namespace test {
 
 enum MessageLoopConfig {
   MESSAGE_LOOP_CONFIG_DEFAULT = 0,
   MESSAGE_LOOP_CONFIG_MOJO = 1
 };
 
@@ skipping 16 matching lines @@
   delete watcher;
   next_callback.Run(result);
 }
 
 scoped_ptr<base::MessageLoop> CreateMessageLoop(MessageLoopConfig config) {
   scoped_ptr<base::MessageLoop> loop;
   if (config == MESSAGE_LOOP_CONFIG_DEFAULT)
     loop.reset(new base::MessageLoop());
   else
     loop.reset(new base::MessageLoop(MessagePumpMojo::Create()));
-  return loop.Pass();
+  return loop;
 }
 
 // Helper class to manage the callback and running the message loop waiting for
 // message to be received. Typical usage is something like:
 //   Schedule callback returned from GetCallback().
 //   RunUntilGotCallback();
 //   EXPECT_TRUE(got_callback());
 //   clear_callback();
 class CallbackHelper {
  public:
@@ skipping 46 matching lines @@
 
   base::WeakPtrFactory<CallbackHelper> weak_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
 };
 
 class HandleWatcherTest : public testing::TestWithParam<MessageLoopConfig> {
  public:
   HandleWatcherTest() : message_loop_(CreateMessageLoop(GetParam())) {}
-  virtual ~HandleWatcherTest() {
+  ~HandleWatcherTest() override {
     test::SetTickClockForTest(NULL);
   }
 
  protected:
   void TearDownMessageLoop() {
     message_loop_.reset();
   }
 
   void InstallTickClock() {
     test::SetTickClockForTest(&tick_clock_);
@@ skipping 339 matching lines @@
                               message_loop.task_runner(),
                               &run_loop, &threads_active_counter));
   }
   run_loop.Run();
   ASSERT_EQ(0, threads_active_counter);
 }
 
 }  // namespace test
 }  // namespace common
 }  // namespace mojo