Adds a way to associate key/value pairs with the environment

mojo/common/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 <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "mojo/common/time_helper.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/tests/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace common {
 namespace test {
 
 void RunUntilIdle() {
   base::RunLoop run_loop;
@@ skipping 69 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
 };
 
 class HandleWatcherTest : public testing::Test {
  public:
   HandleWatcherTest() {}
   virtual ~HandleWatcherTest() {
     test::SetTickClockForTest(NULL);
   }
 
+  virtual void SetUp() OVERRIDE {
+    environment_.reset(new Environment);
+  }
+
+  virtual void TearDown() OVERRIDE {
+    environment_.reset();
+  }
+
  protected:
   void InstallTickClock() {
     test::SetTickClockForTest(&tick_clock_);
   }
 
   base::SimpleTestTickClock tick_clock_;
 
  private:
   base::MessageLoop message_loop_;
+  scoped_ptr<Environment> environment_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleWatcherTest);
 };
 
 // Trivial test case with a single handle to watch.
 TEST_F(HandleWatcherTest, SingleHandler) {
   MessagePipe test_pipe;
   ASSERT_TRUE(test_pipe.handle0.is_valid());
   CallbackHelper callback_helper;
   HandleWatcher watcher;
@@ skipping 179 matching lines @@
                                                callback_helper.GetCallback()));
   EXPECT_TRUE(mojo::test::WriteTextMessage(test_pipe.handle0.get(),
                                            std::string()));
   callback_helper.RunUntilGotCallback();
   EXPECT_TRUE(callback_helper.got_callback());
 }
 
 }  // namespace test
 }  // namespace common
 }  // namespace mojo