  }
  
  bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
-@@ -185,6 +198,14 @@ void ShellMainDelegate::PreSandboxStartup() {
-     breakpad::SetBreakpadClient(g_shell_breakpad_client.Pointer());
+@@ -216,6 +229,14 @@ void ShellMainDelegate::PreSandboxStartup() {
    }
+ 
    InitializeResourceBundle();
 +
 +#if defined(USE_OZONE)

 
 int ShellMainDelegate::RunProcess(
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 954d8de..63b8221 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -130,6 +130,11 @@

   // Create the message-loop here before creating the root window.
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
 
@@ -154,6 +164,10 @@ int DemoMain() {
   root_window->ShowRootWindow();
   base::MessageLoopForUI::current()->Run();
 
