Rename ApplicationLoader::OnServiceError to OnApplicationError

mojo/services/window_manager/window_manager_api_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 97 matching lines @@
   virtual void Load(ApplicationManager* application_manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) MOJO_OVERRIDE {
     ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
     if (!shell_handle.is_valid())
       return;
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
-  virtual void OnServiceError(ApplicationManager* application_manager,
-                              const GURL& url) MOJO_OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* application_manager,
+                                  const GURL& url) MOJO_OVERRIDE {}
 
   // Overridden from ApplicationDelegate:
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) MOJO_OVERRIDE {
     connection->AddService(&view_manager_client_factory_);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(
@@ skipping 144 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo