Rename OnServiceError to OnApplicationError

BUG=

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

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

20 files changed, 62 insertions, 60 deletions

diff --git a/mojo/application_manager/application_loader.h b/mojo/application_manager/application_loader.h
index cf5cf96..5e89a06 100644
--- a/mojo/application_manager/application_loader.h
+++ b/mojo/application_manager/application_loader.h
@@ -75,8 +75,9 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) = 0;
 
-  // TODO(davemoore): Change name to OnApplicationError.
-  virtual void OnServiceError(ApplicationManager* manager, const GURL& url) = 0;
+  // Called when the Application exits.
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) = 0;
 
  protected:
   ApplicationLoader() {}
diff --git a/mojo/application_manager/application_manager.cc b/mojo/application_manager/application_manager.cc
index c9b12de..3281681 100644
--- a/mojo/application_manager/application_manager.cc
+++ b/mojo/application_manager/application_manager.cc
@@ -288,7 +288,7 @@ void ApplicationManager::OnShellImplError(ShellImpl* shell_impl) {
   url_to_shell_impl_.erase(it);
   ApplicationLoader* loader = GetLoaderForURL(url);
   if (loader)
-    loader->OnServiceError(this, url);
+    loader->OnApplicationError(this, url);
   if (delegate_)
     delegate_->OnApplicationError(url);
 }
diff --git a/mojo/application_manager/application_manager_unittest.cc b/mojo/application_manager/application_manager_unittest.cc
index 6b00f60..7dd35e87 100644
--- a/mojo/application_manager/application_manager_unittest.cc
+++ b/mojo/application_manager/application_manager_unittest.cc
@@ -118,8 +118,8 @@ class TestApplicationLoader : public ApplicationLoader,
         new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   // ApplicationDelegate implementation.
   virtual bool ConfigureIncomingConnection(
@@ -329,8 +329,8 @@ class Tester : public ApplicationDelegate,
         new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
   }
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) OVERRIDE {
diff --git a/mojo/application_manager/background_shell_application_loader.cc b/mojo/application_manager/background_shell_application_loader.cc
index 7dd8e67..e6664db 100644
--- a/mojo/application_manager/background_shell_application_loader.cc
+++ b/mojo/application_manager/background_shell_application_loader.cc
@@ -23,8 +23,8 @@ class BackgroundShellApplicationLoader::BackgroundLoader {
     loader_->Load(manager, url, callbacks);
   }
 
-  void OnServiceError(ApplicationManager* manager, const GURL& url) {
-    loader_->OnServiceError(manager, url);
+  void OnApplicationError(ApplicationManager* manager, const GURL& url) {
+    loader_->OnApplicationError(manager, url);
   }
 
  private:
@@ -80,16 +80,15 @@ void BackgroundShellApplicationLoader::Load(
           base::Owned(new ScopedMessagePipeHandle(shell_handle.Pass()))));
 }
 
-void BackgroundShellApplicationLoader::OnServiceError(
+void BackgroundShellApplicationLoader::OnApplicationError(
     ApplicationManager* manager,
     const GURL& url) {
-  task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(
-          &BackgroundShellApplicationLoader::OnServiceErrorOnBackgroundThread,
-          base::Unretained(this),
-          manager,
-          url));
+  task_runner_->PostTask(FROM_HERE,
+                         base::Bind(&BackgroundShellApplicationLoader::
+                                        OnApplicationErrorOnBackgroundThread,
+                                    base::Unretained(this),
+                                    manager,
+                                    url));
 }
 
 void BackgroundShellApplicationLoader::Run() {
@@ -116,13 +115,13 @@ void BackgroundShellApplicationLoader::LoadOnBackgroundThread(
   background_loader_->Load(manager, url, shell_handle->Pass());
 }
 
-void BackgroundShellApplicationLoader::OnServiceErrorOnBackgroundThread(
+void BackgroundShellApplicationLoader::OnApplicationErrorOnBackgroundThread(
     ApplicationManager* manager,
     const GURL& url) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
-  background_loader_->OnServiceError(manager, url);
+  background_loader_->OnApplicationError(manager, url);
 }
 
 }  // namespace mojo
diff --git a/mojo/application_manager/background_shell_application_loader.h b/mojo/application_manager/background_shell_application_loader.h
index ee34ad8..e890903 100644
--- a/mojo/application_manager/background_shell_application_loader.h
+++ b/mojo/application_manager/background_shell_application_loader.h
@@ -29,8 +29,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT BackgroundShellApplicationLoader
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
  private:
   class BackgroundLoader;
@@ -45,8 +45,8 @@ class MOJO_APPLICATION_MANAGER_EXPORT BackgroundShellApplicationLoader
   void LoadOnBackgroundThread(ApplicationManager* manager,
                               const GURL& url,
                               ScopedMessagePipeHandle* shell_handle);
-  void OnServiceErrorOnBackgroundThread(ApplicationManager* manager,
-                                        const GURL& url);
+  void OnApplicationErrorOnBackgroundThread(ApplicationManager* manager,
+                                            const GURL& url);
   bool quit_on_shutdown_;
   scoped_ptr<ApplicationLoader> loader_;
 
diff --git a/mojo/application_manager/background_shell_application_loader_unittest.cc b/mojo/application_manager/background_shell_application_loader_unittest.cc
index 4de4b85..0fbf3b0 100644
--- a/mojo/application_manager/background_shell_application_loader_unittest.cc
+++ b/mojo/application_manager/background_shell_application_loader_unittest.cc
@@ -23,8 +23,8 @@ class DummyLoader : public ApplicationLoader {
       base::MessageLoop::current()->Quit();
   }
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   void DontSimulateAppQuit() { simulate_app_quit_ = false; }
 
diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
index 9f47292..c9419a4 100644
--- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
+++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
@@ -64,8 +64,8 @@ class ConnectApplicationLoader : public ApplicationLoader,
     apps_.push_back(app.release());
   }
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index 5ea3b71..2c97f42 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -360,8 +360,8 @@ class EmbedApplicationLoader : public ApplicationLoader,
                                                         shell_handle.Pass()));
     apps_.push_back(app.release());
   }
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   // ApplicationDelegate implementation:
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
diff --git a/mojo/services/window_manager/window_manager_api_unittest.cc b/mojo/services/window_manager/window_manager_api_unittest.cc
index f7a0e96..b81f330 100644
--- a/mojo/services/window_manager/window_manager_api_unittest.cc
+++ b/mojo/services/window_manager/window_manager_api_unittest.cc
@@ -115,8 +115,8 @@ class TestApplicationLoader : public ApplicationLoader,
         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(
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index af1bd89..706c511 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -127,8 +127,8 @@ class Context::NativeViewportApplicationLoader
       app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
   }
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE {}
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE {}
 
   // ApplicationDelegate implementation.
   virtual bool ConfigureIncomingConnection(
diff --git a/mojo/shell/dbus_application_loader_linux.cc b/mojo/shell/dbus_application_loader_linux.cc
index 14d9fd2..743d7fd 100644
--- a/mojo/shell/dbus_application_loader_linux.cc
+++ b/mojo/shell/dbus_application_loader_linux.cc
@@ -162,8 +162,8 @@ void DBusApplicationLoader::Load(ApplicationManager* manager,
       new LoadContext(this, bus_, url, shell_handle.Pass());
 }
 
-void DBusApplicationLoader::OnServiceError(ApplicationManager* manager,
-                                           const GURL& url) {
+void DBusApplicationLoader::OnApplicationError(ApplicationManager* manager,
+                                               const GURL& url) {
   // TODO(cmasone): Anything at all in this method here.
 }
 
diff --git a/mojo/shell/dbus_application_loader_linux.h b/mojo/shell/dbus_application_loader_linux.h
index 1f03be1..c1cba41 100644
--- a/mojo/shell/dbus_application_loader_linux.h
+++ b/mojo/shell/dbus_application_loader_linux.h
@@ -64,8 +64,8 @@ class DBusApplicationLoader : public ApplicationLoader {
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
 
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
  private:
   class LoadContext;
diff --git a/mojo/shell/dynamic_application_loader.cc b/mojo/shell/dynamic_application_loader.cc
index 1bccd58..718ece4 100644
--- a/mojo/shell/dynamic_application_loader.cc
+++ b/mojo/shell/dynamic_application_loader.cc
@@ -167,8 +167,8 @@ void DynamicApplicationLoader::OnRunLibraryComplete(
   }
 }
 
-void DynamicApplicationLoader::OnServiceError(ApplicationManager* manager,
-                                              const GURL& url) {
+void DynamicApplicationLoader::OnApplicationError(ApplicationManager* manager,
+                                                  const GURL& url) {
   // TODO(darin): What should we do about service errors? This implies that
   // the app closed its handle to the service manager. Maybe we don't care?
 }
diff --git a/mojo/shell/dynamic_application_loader.h b/mojo/shell/dynamic_application_loader.h
index 5b400b9..36546e9 100644
--- a/mojo/shell/dynamic_application_loader.h
+++ b/mojo/shell/dynamic_application_loader.h
@@ -40,8 +40,8 @@ class DynamicApplicationLoader : public ApplicationLoader {
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
  private:
   typedef std::map<std::string, GURL> MimeTypeToURLMap;
diff --git a/mojo/shell/network_application_loader.cc b/mojo/shell/network_application_loader.cc
index 1a7cf3c..dbe70b7 100644
--- a/mojo/shell/network_application_loader.cc
+++ b/mojo/shell/network_application_loader.cc
@@ -44,8 +44,8 @@ void NetworkApplicationLoader::Load(ApplicationManager* manager,
   }
 }
 
-void NetworkApplicationLoader::OnServiceError(ApplicationManager* manager,
-                                              const GURL& url) {
+void NetworkApplicationLoader::OnApplicationError(ApplicationManager* manager,
+                                                  const GURL& url) {
   apps_.erase(reinterpret_cast<uintptr_t>(manager));
 }
 
diff --git a/mojo/shell/network_application_loader.h b/mojo/shell/network_application_loader.h
index f8ff291..9b1ad15 100644
--- a/mojo/shell/network_application_loader.h
+++ b/mojo/shell/network_application_loader.h
@@ -34,8 +34,8 @@ class NetworkApplicationLoader : public ApplicationLoader,
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
   // ApplicationDelegate overrides.
   virtual void Initialize(ApplicationImpl* app) OVERRIDE;
diff --git a/mojo/shell/ui_application_loader_android.cc b/mojo/shell/ui_application_loader_android.cc
index d56211e..1e4e5aa 100644
--- a/mojo/shell/ui_application_loader_android.cc
+++ b/mojo/shell/ui_application_loader_android.cc
@@ -23,8 +23,8 @@ class UIApplicationLoader::UILoader {
     loader_->Load(manager, url, callbacks);
   }
 
-  void OnServiceError(ApplicationManager* manager, const GURL& url) {
-    loader_->OnServiceError(manager, url);
+  void OnApplicationError(ApplicationManager* manager, const GURL& url) {
+    loader_->OnApplicationError(manager, url);
   }
 
  private:
@@ -62,11 +62,11 @@ void UIApplicationLoader::Load(ApplicationManager* manager,
           base::Owned(new ScopedMessagePipeHandle(shell_handle.Pass()))));
 }
 
-void UIApplicationLoader::OnServiceError(ApplicationManager* manager,
-                                         const GURL& url) {
+void UIApplicationLoader::OnApplicationError(ApplicationManager* manager,
+                                             const GURL& url) {
   context_->ui_loop()->PostTask(
       FROM_HERE,
-      base::Bind(&UIApplicationLoader::OnServiceErrorOnUIThread,
+      base::Bind(&UIApplicationLoader::OnApplicationErrorOnUIThread,
                  base::Unretained(this),
                  manager,
                  url));
@@ -81,11 +81,12 @@ void UIApplicationLoader::LoadOnUIThread(
   ui_loader_->Load(manager, url, shell_handle->Pass());
 }
 
-void UIApplicationLoader::OnServiceErrorOnUIThread(ApplicationManager* manager,
-                                                   const GURL& url) {
+void UIApplicationLoader::OnApplicationErrorOnUIThread(
+    ApplicationManager* manager,
+    const GURL& url) {
   if (!ui_loader_)
     ui_loader_ = new UILoader(loader_.get());
-  ui_loader_->OnServiceError(manager, url);
+  ui_loader_->OnApplicationError(manager, url);
 }
 
 void UIApplicationLoader::ShutdownOnUIThread() {
diff --git a/mojo/shell/ui_application_loader_android.h b/mojo/shell/ui_application_loader_android.h
index 3195b8e..074a070 100644
--- a/mojo/shell/ui_application_loader_android.h
+++ b/mojo/shell/ui_application_loader_android.h
@@ -29,8 +29,8 @@ class UIApplicationLoader : public ApplicationLoader {
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
  private:
   class UILoader;
@@ -42,7 +42,8 @@ class UIApplicationLoader : public ApplicationLoader {
   void LoadOnUIThread(ApplicationManager* manager,
                       const GURL& url,
                       ScopedMessagePipeHandle* shell_handle);
-  void OnServiceErrorOnUIThread(ApplicationManager* manager, const GURL& url);
+  void OnApplicationErrorOnUIThread(ApplicationManager* manager,
+                                    const GURL& url);
   void ShutdownOnUIThread();
 
   scoped_ptr<ApplicationLoader> loader_;
diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc
index 844e8a7..9128084 100644
--- a/mojo/shell/view_manager_loader.cc
+++ b/mojo/shell/view_manager_loader.cc
@@ -34,8 +34,8 @@ void ViewManagerLoader::Load(ApplicationManager* manager,
   apps_.push_back(app.release());
 }
 
-void ViewManagerLoader::OnServiceError(ApplicationManager* manager,
-                                       const GURL& url) {
+void ViewManagerLoader::OnApplicationError(ApplicationManager* manager,
+                                           const GURL& url) {
 }
 
 bool ViewManagerLoader::ConfigureIncomingConnection(
diff --git a/mojo/shell/view_manager_loader.h b/mojo/shell/view_manager_loader.h
index e744cae..1491247 100644
--- a/mojo/shell/view_manager_loader.h
+++ b/mojo/shell/view_manager_loader.h
@@ -32,8 +32,8 @@ class ViewManagerLoader : public ApplicationLoader,
   virtual void Load(ApplicationManager* manager,
                     const GURL& url,
                     scoped_refptr<LoadCallbacks> callbacks) OVERRIDE;
-  virtual void OnServiceError(ApplicationManager* manager,
-                              const GURL& url) OVERRIDE;
+  virtual void OnApplicationError(ApplicationManager* manager,
+                                  const GURL& url) OVERRIDE;
 
   // ApplicationDelegate overrides.
   virtual bool ConfigureIncomingConnection(