Mojo: cancel pending AsyncWait calls when the callers thread exits

mojo/apps/js/test/js_to_cpp_unittest.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 "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gin/public/isolate_holder.h"
@@ skipping 161 matching lines @@
 
   virtual void BitFlipResponse(const js_to_cpp::EchoArgs& arg1) OVERRIDE {
     NOTREACHED();
   }
 
  protected:
   base::RunLoop* run_loop_;
   js_to_cpp::JsSide* js_side_;
 
  private:
-  Environment environment;
   DISALLOW_COPY_AND_ASSIGN(CppSideConnection);
 };
 
 // Trivial test to verify a message sent from JS is received.
 class PingCppSideConnection : public CppSideConnection {
  public:
   explicit PingCppSideConnection() : got_message_(false) {}
   virtual ~PingCppSideConnection() {}
 
   // js_to_cpp::CppSide:
@@ skipping 114 matching lines @@
 
     gin::IsolateHolder instance(gin::IsolateHolder::kStrictMode);
     apps::MojoRunnerDelegate delegate;
     gin::ShellRunner runner(&delegate, instance.isolate());
     delegate.Start(&runner, pipe.handle1.release().value(), test);
 
     run_loop_.Run();
   }
 
  private:
+  Environment environment;
   base::MessageLoop loop;
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(JsToCppTest);
 };
 
 TEST_F(JsToCppTest, Ping) {
   if (IsRunningOnIsolatedBot())
     return;
 
@@ skipping 16 matching lines @@
   if (IsRunningOnIsolatedBot())
     return;
 
   BitFlipCppSideConnection cpp_side_connection;
   RunTest("mojo/apps/js/test/js_to_cpp_unittest", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 }  // namespace js
 }  // namespace mojo