Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd

Update mojo sdk to rev 126532ce21c5c3c55a1e1693731411cb60169efd

Update HTMLViewer for de-clienting of Shell.

Update ServiceRegistryTest.java for de-clienting of MathCalculator.

NOPRESUBMIT=true

Committed: https://crrev.com/29cbd973babcdcddc9df43f492088fa69795874e
Cr-Commit-Position: refs/heads/master@{#313729}

[blundell, 2015-01-28 18:39:17]

blundell@chromium.org changed reviewers:
+ jamesr@chromium.org, ppi@chromium.org

[blundell, 2015-01-28 18:39:18]

rockot: FYI.

This patch is not ready for landing, but I'd like to call in the audience for
some assistance.

James: Could you look over the changes to HTMLViewer to adapt to de-clienting?
Additionally, do you have any insight into
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...

ppi: The Android compilation failures are due to
https://codereview.chromium.org/864123002/. The C++-side changes there look
rather involved. Do you see a straightforward path to adaptation on the Java
side?

[jamesr, 2015-01-28 18:46:25]

html_viewer lgtm

The MasterConnectionManager errors are because that part of the EDK is declared
a component() but it doesn't have the correct export annotations.

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
File mojo/services/html_viewer/html_viewer.cc (right):

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
mojo/services/html_viewer/html_viewer.cc:74: mojo::Array<mojo::String> args)
override {
we have 'using mojo::Array' and 'mojo::String' declarations on lines 36 / 43, so
you can just say Array<String> args here.

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
mojo/services/html_viewer/html_viewer.cc:76:
shell_->ConnectToApplication("mojo:network_service",
you probably want to assign shell to shell_ before this

[jamesr, 2015-01-28 18:51:44]

You *probably* just need a MOJO_SYSTEM_IMPL_EXPORT annotation on both
MasterConnectionManager and SlaveConnectionManager's class declaration. Does
that sound right, Trung?

[ppi, 2015-01-28 19:02:18]

Re Java changes - yes, the changes are pretty straightforward and correspond to
what is changed in the mojom file: drop CalculatorUI and rely on callbacks to
get the results.

Happy to put together a patch, we can coordinate in person tomorrow.

Thanks for looking into this!

[blundell, 2015-01-28 19:29:59]

On 2015/01/28 18:51:44, jamesr wrote:
> You *probably* just need a MOJO_SYSTEM_IMPL_EXPORT annotation on both
> MasterConnectionManager and SlaveConnectionManager's class declaration. Does
> that sound right, Trung?

I verified locally that that is correct.

https://codereview.chromium.org/882183002/

[blundell, 2015-01-29 11:39:32]

Thanks, James. Rolled Mojo forward to catch the component build fix.

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
File mojo/services/html_viewer/html_viewer.cc (right):

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
mojo/services/html_viewer/html_viewer.cc:74: mojo::Array<mojo::String> args)
override {
On 2015/01/28 18:46:25, jamesr wrote:
> we have 'using mojo::Array' and 'mojo::String' declarations on lines 36 / 43,
so
> you can just say Array<String> args here.

Done.

https://codereview.chromium.org/883843002/diff/20001/mojo/services/html_viewe...
mojo/services/html_viewer/html_viewer.cc:76:
shell_->ConnectToApplication("mojo:network_service",
On 2015/01/28 18:46:24, jamesr wrote:
> you probably want to assign shell to shell_ before this

whoops! good catch, thanks.

[blundell, 2015-01-29 14:54:04]

ppi: Can you look at ServiceRegistryTest.java?

[ppi, 2015-01-29 15:18:27]

lgtm % nits, thanks!

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java
(right):

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java:36:
public static class CalcConnectionErrorHandler implements ConnectionErrorHandler
{
I think "public" is not needed here.

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java:40:
public CalcConnectionErrorHandler() {
I think the default constructor should work.

[blundell, 2015-01-29 15:21:55]

Thanks! As discussed offline, going to land this and address the nits in a
followup change.

[blundell, 2015-01-29 15:22:10]

The CQ bit was checked by blundell@chromium.org

[blundell, 2015-01-29 15:22:13]

The CQ bit was unchecked by blundell@chromium.org

[blundell, 2015-01-29 15:22:30]

blundell@chromium.org changed reviewers:
+ ben@chromium.org

[blundell, 2015-01-29 15:23:23]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2015-01-29 15:23:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/883843002/100001

[commit-bot: I haz the power, 2015-01-29 15:30:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-01-29 15:30:11]

Try jobs failed on following builders:
  chromium_presubmit on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[blundell, 2015-01-29 16:28:42]

Changes made.

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
File
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java
(right):

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java:36:
public static class CalcConnectionErrorHandler implements ConnectionErrorHandler
{
On 2015/01/29 15:18:27, ppi wrote:
> I think "public" is not needed here.

Done.

https://codereview.chromium.org/883843002/diff/100001/content/public/android/...
content/public/android/javatests/src/org/chromium/content/browser/ServiceRegistryTest.java:40:
public CalcConnectionErrorHandler() {
On 2015/01/29 15:18:27, ppi wrote:
> I think the default constructor should work.

Done.

[blundell, 2015-01-29 16:28:54]

blundell@chromium.org changed reviewers:
- ben@chromium.org

[blundell, 2015-01-29 16:29:40]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2015-01-29 16:29:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/883843002/120001

[commit-bot: I haz the power, 2015-01-29 17:36:44]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2015-01-29 17:37:46]

Patchset 7 (id:??) landed as
https://crrev.com/29cbd973babcdcddc9df43f492088fa69795874e
Cr-Commit-Position: refs/heads/master@{#313729}