Mojo: Make GetDefault{AsyncWaiter,Logger} static methods of Environment.

mojo/android/system/core_impl.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 "mojo/android/system/core_impl.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "jni/CoreImpl_jni.h"
 #include "mojo/embedder/embedder.h"
 #include "mojo/public/c/environment/async_waiter.h"
 #include "mojo/public/c/system/core.h"
-#include "mojo/public/cpp/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/environment.h"
 
 namespace {
 
 // |AsyncWait| is guaranteed never to return 0.
 const MojoAsyncWaitID kInvalidHandleCancelID = 0;
 
 struct AsyncWaitCallbackData {
   base::android::ScopedJavaGlobalRef<jobject> core_impl;
   base::android::ScopedJavaGlobalRef<jobject> callback;
   base::android::ScopedJavaGlobalRef<jobject> cancellable;
@@ skipping 293 matching lines @@
 static jobject AsyncWait(JNIEnv* env,
                          jobject jcaller,
                          jint mojo_handle,
                          jint signals,
                          jlong deadline,
                          jobject callback) {
   AsyncWaitCallbackData* callback_data =
       new AsyncWaitCallbackData(env, jcaller, callback);
   MojoAsyncWaitID cancel_id;
   if (static_cast<MojoHandle>(mojo_handle) != MOJO_HANDLE_INVALID) {
-    cancel_id = mojo::GetDefaultAsyncWaiter()->AsyncWait(mojo_handle,
-                                                         signals,
-                                                         deadline,
-                                                         AsyncWaitCallback,
-                                                         callback_data);
+    cancel_id = mojo::Environment::GetDefaultAsyncWaiter()->AsyncWait(
+        mojo_handle, signals, deadline, AsyncWaitCallback, callback_data);
   } else {
     cancel_id = kInvalidHandleCancelID;
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &AsyncWaitCallback, callback_data, MOJO_RESULT_INVALID_ARGUMENT));
   }
   base::android::ScopedJavaLocalRef<jobject> cancellable =
       Java_CoreImpl_newAsyncWaiterCancellableImpl(
           env, jcaller, cancel_id, reinterpret_cast<intptr_t>(callback_data));
   callback_data->cancellable.Reset(env, cancellable.obj());
   return cancellable.Release();
 }
 
 static void CancelAsyncWait(JNIEnv* env,
                             jobject jcaller,
                             jlong id,
                             jlong data_ptr) {
   if (id == 0) {
     // If |id| is |kInvalidHandleCancelID|, the async wait was done on an
     // invalid handle, so the AsyncWaitCallback will be called and will clear
     // the data_ptr.
     return;
   }
   scoped_ptr<AsyncWaitCallbackData> deleter(
       reinterpret_cast<AsyncWaitCallbackData*>(data_ptr));
-  mojo::GetDefaultAsyncWaiter()->CancelWait(id);
+  mojo::Environment::GetDefaultAsyncWaiter()->CancelWait(id);
 }
 
 bool RegisterCoreImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo