Mojo: AsyncWaiter and mojo/public/environment

mojo/examples/sample_app/sample_app.cc

Index: mojo/examples/sample_app/sample_app.cc
diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc
index c9183f232ac3e31980ca2dd6d053b072b1e55782..8b3d763d537c64078ffd54672dc3640aaef62748 100644
--- a/mojo/examples/sample_app/sample_app.cc
+++ b/mojo/examples/sample_app/sample_app.cc
@@ -6,12 +6,11 @@
 #include <string>
 
 #include "mojo/examples/sample_app/gles2_client_impl.h"
-#include "mojo/public/bindings/lib/bindings_support.h"
 #include "mojo/public/bindings/lib/remote_ptr.h"
+#include "mojo/public/environment/environment.h"
 #include "mojo/public/gles2/gles2.h"
 #include "mojo/public/system/core.h"
 #include "mojo/public/system/macros.h"
-#include "mojo/public/utility/environment.h"
 #include "mojo/public/utility/run_loop.h"
 #include "mojom/native_viewport.h"
 #include "mojom/shell.h"
@@ -94,6 +93,5 @@ extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
   loop.Run();
 
   MojoGLES2Terminate();
-  mojo::BindingsSupport::Set(NULL);
   return MOJO_RESULT_OK;
 }