Add creation of ServiceManager to Content

Add creation of ServiceManager to Content

BUG=None
TEST=Mojo.Init
R=jam@chromium.org, sky@chromium.org, jam

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258438

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258607

[DaveMoore, 2014-03-06 23:32:11]

Clean up existing tab in file

[jam, 2014-03-19 00:16:48]

btw now ContentMain's initialization code runs in the browser process during
browser_tests, after r257597

[DaveMoore, 2014-03-19 21:17:03]

Merge mojo initializations

[DaveMoore, 2014-03-19 21:23:33]

Cleanup

[DaveMoore, 2014-03-19 21:34:04]

Merge problem w/ mojo_public.gypi

[DaveMoore, 2014-03-19 21:43:00]

Add missing file

[DaveMoore, 2014-03-19 23:04:33]

Check USE_MOJO for Windows bots

[sky, 2014-03-19 23:48:28]

https://codereview.chromium.org/187183002/diff/140001/content/common/mojo/moj...
File content/common/mojo/mojo_browsertest.cc (right):

https://codereview.chromium.org/187183002/diff/140001/content/common/mojo/moj...
content/common/mojo/mojo_browsertest.cc:1: // Copyright (c) 2014 The Chromium
Authors. All rights reserved.
Maybe this file should be named mojo_init_browsertest?

https://codereview.chromium.org/187183002/diff/140001/content/content_common....
File content/content_common.gypi (right):

https://codereview.chromium.org/187183002/diff/140001/content/content_common....
content/content_common.gypi:9: '../mojo/mojo.gyp:mojo_environment_chromium',
These should be moved to around 512ish (use_mojo==1).

https://codereview.chromium.org/187183002/diff/140001/content/content_tests.gypi
File content/content_tests.gypi (right):

https://codereview.chromium.org/187183002/diff/140001/content/content_tests.g...
content/content_tests.gypi:940: '../mojo/mojo.gyp:mojo_environment_chromium',
Guard these in a use_mojo==1 block.

https://codereview.chromium.org/187183002/diff/140001/mojo/service_manager/se...
File mojo/service_manager/service_manager_export.h (right):

https://codereview.chromium.org/187183002/diff/140001/mojo/service_manager/se...
mojo/service_manager/service_manager_export.h:1: // Copyright 2013 The Chromium
Authors. All rights reserved.
2014

[DaveMoore, 2014-03-20 00:04:07]

Add more use_mojo protects

[DaveMoore, 2014-03-20 00:04:25]

https://codereview.chromium.org/187183002/diff/140001/content/common/mojo/moj...
File content/common/mojo/mojo_browsertest.cc (right):

https://codereview.chromium.org/187183002/diff/140001/content/common/mojo/moj...
content/common/mojo/mojo_browsertest.cc:1: // Copyright (c) 2014 The Chromium
Authors. All rights reserved.
This is a placeholder for real tests, when the servicemanager really does
something.

On 2014/03/19 23:48:29, sky wrote:
> Maybe this file should be named mojo_init_browsertest?

https://codereview.chromium.org/187183002/diff/140001/content/content_common....
File content/content_common.gypi (right):

https://codereview.chromium.org/187183002/diff/140001/content/content_common....
content/content_common.gypi:9: '../mojo/mojo.gyp:mojo_environment_chromium',
On 2014/03/19 23:48:29, sky wrote:
> These should be moved to around 512ish (use_mojo==1).

Done.

https://codereview.chromium.org/187183002/diff/140001/content/content_tests.gypi
File content/content_tests.gypi (right):

https://codereview.chromium.org/187183002/diff/140001/content/content_tests.g...
content/content_tests.gypi:940: '../mojo/mojo.gyp:mojo_environment_chromium',
On 2014/03/19 23:48:29, sky wrote:
> Guard these in a use_mojo==1 block.

Done.

https://codereview.chromium.org/187183002/diff/140001/mojo/service_manager/se...
File mojo/service_manager/service_manager_export.h (right):

https://codereview.chromium.org/187183002/diff/140001/mojo/service_manager/se...
mojo/service_manager/service_manager_export.h:1: // Copyright 2013 The Chromium
Authors. All rights reserved.
On 2014/03/19 23:48:29, sky wrote:
> 2014

Done.

[sky, 2014-03-20 02:20:14]

LGTM

[DaveMoore, 2014-03-20 14:26:56]

Remove extraneous export

[jam, 2014-03-20 17:06:54]

the new code in content/common should go into content/app/mojo. the reasoning is
that content/common is code that is called by multiple different directories for
processes, i.e. if content/renderer and content/browser have shared code, it
would go into content/common. if code is only called by subprocesses (i.e. not
browser), such as content/renderer and content/plugin, it would go into
content/child. for this code, it's only called by content/app, so it should stay
in content/app.

lgtm with that change

[DaveMoore, 2014-03-20 19:34:32]

Move mojo_init to content/app

[DaveMoore, 2014-03-20 21:33:17]

Move mojo_init to content/app

[DaveMoore, 2014-03-20 22:26:31]

Committed patchset #12 manually as r258438 (presubmit successful).

[DaveMoore, 2014-03-21 16:44:24]

Merge problem

[DaveMoore, 2014-03-21 16:44:45]

Committed patchset #13 manually as r258607 (presubmit successful).

[vandebo (ex-Chrome), 2014-03-21 17:49:02]

A revert of this CL has been created in
https://codereview.chromium.org/208223006/ by vandebo@chromium.org.

The reason for reverting is: Tests fail on Mac.