Make GTK and Aura parts orthogonal to OS parts

content/shell/shell_browser_main.cc

Index: content/shell/shell_browser_main.cc
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc
index ae3b0c1ac8f0f4be63f91520752f3b0ab0fe505a..6d5a32beef83afb4d0b48bd19d3ad777736b38f1 100644
--- a/content/shell/shell_browser_main.cc
+++ b/content/shell/shell_browser_main.cc
@@ -21,7 +21,7 @@ namespace content {
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const MainFunctionParams& parameters)
-    : BrowserMainParts(parameters) {
+    : BrowserMainParts() {
   ShellContentBrowserClient* shell_browser_client =
       static_cast<ShellContentBrowserClient*>(
           content::GetContentClient()->browser());
@@ -47,7 +47,7 @@ ShellBrowserMainParts::~ShellBrowserMainParts() {
   db_thread_.reset();
 }
 
-void ShellBrowserMainParts::PreMainMessageLoopRun() {
+int ShellBrowserMainParts::PreMainMessageLoopRun() {
   db_thread_.reset(new BrowserProcessSubThread(BrowserThread::DB));
   db_thread_->Start();
   file_thread_.reset(new BrowserProcessSubThread(BrowserThread::FILE));
@@ -74,6 +74,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
                          NULL,
                          MSG_ROUTING_NONE,
                          NULL);
+
+  return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 ResourceDispatcherHost* ShellBrowserMainParts::GetResourceDispatcherHost() {