Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

Re-land number two. Now with cherry-picked android test fix.

BUG=None
TBR=jam@chromium.org,ben@chromium.org
TBR=mfoltz@chromium.org
TBR=mek@chromium.org
TBR=xhwang@chromium.org
TBR=shess@chromium.org

Review URL: https://codereview.chromium.org/1311043003

Cr-Commit-Position: refs/heads/master@{#345106}

1 files changed, 4 insertions, 4 deletions

diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc
index ae14208..be76bac 100644
--- a/extensions/browser/mojo/stash_backend_unittest.cc
+++ b/extensions/browser/mojo/stash_backend_unittest.cc
@@ -33,7 +33,7 @@ mojo::ScopedHandle CreateReadableHandle() {
 
 }  // namespace
 
-class StashServiceTest : public testing::Test, public mojo::ErrorHandler {
+class StashServiceTest : public testing::Test {
  public:
   enum Event {
     EVENT_NONE,
@@ -49,11 +49,11 @@ class StashServiceTest : public testing::Test, public mojo::ErrorHandler {
     stash_backend_.reset(new StashBackend(base::Bind(
         &StashServiceTest::OnHandleReadyToRead, base::Unretained(this))));
     stash_backend_->BindToRequest(mojo::GetProxy(&stash_service_));
-    stash_service_.set_error_handler(this);
+    stash_service_.set_connection_error_handler(base::Bind(&OnConnectionError));
     handles_ready_ = 0;
   }
 
-  void OnConnectionError() override { FAIL() << "Unexpected connection error"; }
+  static void OnConnectionError() { FAIL() << "Unexpected connection error"; }
 
   mojo::Array<StashedObjectPtr> RetrieveStash() {
     mojo::Array<StashedObjectPtr> stash;
@@ -271,7 +271,7 @@ TEST_F(StashServiceTest, NotifyOncePerStashOnReadableHandles) {
 // exists.
 TEST_F(StashServiceTest, ServiceWithDeletedBackend) {
   stash_backend_.reset();
-  stash_service_.set_error_handler(this);
+  stash_service_.set_connection_error_handler(base::Bind(&OnConnectionError));
 
   mojo::Array<StashedObjectPtr> stashed_objects;
   StashedObjectPtr stashed_object(StashedObject::New());