NOT FOR REVIEW: Aura on Android

chrome/browser/chrome_browser_main_android.cc

Index: chrome/browser/chrome_browser_main_android.cc
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
index c25fabcb5fc31c638c6a76193c66450e431337c2..7ab6bfbe62d90b56225f9cb7471a207ce818cf36 100644
--- a/chrome/browser/chrome_browser_main_android.cc
+++ b/chrome/browser/chrome_browser_main_android.cc
@@ -29,6 +29,11 @@
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 
+#if defined(USE_AURA)
+#include "content/public/browser/context_factory.h"
+#include "ui/wm/test/wm_test_helper.h"
+#endif
+
 namespace {
 
 void DeleteFileTask(
@@ -81,6 +86,24 @@ int ChromeBrowserMainPartsAndroid::PreCreateThreads() {
   return ChromeBrowserMainParts::PreCreateThreads();
 }
 
+#if defined(USE_AURA)
+void ChromeBrowserMainPartsAndroid::InitAndroidAura() {
+  wm_test_helper_.reset(new wm::WMTestHelper(
+      gfx::Size(800, 600),
+      content::GetContextFactory()));
+  wm_test_helper_->host()->Show();
+}
+#endif
+
+void ChromeBrowserMainPartsAndroid::PreProfileInit() {
+#if defined(USE_AURA)
+  InitAndroidAura();
+#endif
+
+  ChromeBrowserMainParts::PreProfileInit();
+
+}
+
 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
   Profile* main_profile = profile();
   search_counter_.reset(new GoogleSearchCounterAndroid(main_profile));
@@ -105,7 +128,9 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {
   net::NetworkChangeNotifier::SetFactory(
       new net::NetworkChangeNotifierFactoryAndroid());
 
+#if !defined(USE_AURA)
   content::Compositor::Initialize();
+#endif
 
   // Chrome on Android does not use default MessageLoop. It has its own
   // Android specific MessageLoop.