Implement OzonePlatform

content/app/content_main_runner.cc

 // Copyright (c) 2012 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 "content/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 77 matching lines @@
 
 #if !defined(OS_MACOSX)
 #include "content/public/common/zygote_fork_delegate_linux.h"
 #endif
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include "content/zygote/zygote_main.h"
 #endif
 
 #endif  // OS_POSIX
 
+#if defined(USE_OZONE)
+#include "ui/ozone/ozone_platform.h"
+#endif
+
 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
 extern "C" {
 int tc_set_new_mode(int mode);
 }
 #endif
 
 namespace content {
 extern int GpuMain(const content::MainFunctionParams&);
 #if defined(ENABLE_PLUGINS)
 extern int PluginMain(const content::MainFunctionParams&);
@@ skipping 605 matching lines @@
 #endif
 
     ui::RegisterPathProvider();
     RegisterPathProvider();
     RegisterContentSchemes(true);
 
     CHECK(base::i18n::InitializeICU());
 
     InitializeStatsTable(command_line);
 
+#if defined(USE_OZONE)
+    ozone_platform_.reset(ui::OzonePlatform::Create());
+#endif
+

[vignatti (out of this project), 2013/10/28 15:26:44]

have you thought whether a single line like this would work also for other
targets that don't depend on content like aura_demo, or a few other tests? 

[spang, 2013/10/28 15:42:30]

I do think we should be able to find a place to own the platform in most cases.
We should probably not try to do them all in one CL though.

     if (delegate)
       delegate->PreSandboxStartup();
 
     // Set any custom user agent passed on the command line now so the string
     // doesn't change between calls to webkit_glue::GetUserAgent(), otherwise it
     // defaults to the user agent set during SetContentClient().
     if (command_line.HasSwitch(switches::kUserAgent)) {
       webkit_glue::SetUserAgent(
           command_line.GetSwitchValueASCII(switches::kUserAgent), true);
     }
@@ skipping 91 matching lines @@
 
   // The delegate will outlive this object.
   ContentMainDelegate* delegate_;
 
   scoped_ptr<base::AtExitManager> exit_manager_;
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo sandbox_info_;
 #elif defined(OS_MACOSX)
   scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
 #endif
+#if defined(USE_OZONE)
+  scoped_ptr<ui::OzonePlatform> ozone_platform_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content