Initialize compositor early on so the rest of the code can assumed it is

already initialized.

BUG=162312
TEST=Chrome, content shell and test shell should still work.

Review URL: https://chromiumcodereview.appspot.com/11280097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169716 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc
index 33414c6..88262c9 100644
--- a/content/shell/android/shell_library_loader.cc
+++ b/content/shell/android/shell_library_loader.cc
@@ -9,6 +9,7 @@
 #include "base/android/jni_registrar.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
+#include "content/public/browser/android/compositor.h"
 #include "content/shell/android/shell_manager.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_main_delegate.h"
@@ -22,9 +23,8 @@ static base::android::RegistrationMethod kRegistrationMethods[] = {
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
-  if (!content::RegisterLibraryLoaderEntryHook(env)) {
+  if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
-  }
 
   // To be called only from the UI thread.  If loading the library is done on
   // a separate thread, this should be moved elsewhere.
@@ -32,6 +32,8 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
                                             arraysize(kRegistrationMethods)))
     return -1;
 
+  content::Compositor::Initialize();
+
   content::SetContentMainDelegate(new content::ShellMainDelegate());
 
   return JNI_VERSION_1_4;