Rename ApplicationLoader::OnServiceError to OnApplicationError

mojo/application_manager/background_shell_application_loader.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 "mojo/application_manager/background_shell_application_loader.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "mojo/application_manager/application_manager.h"
 
 namespace mojo {
 
 class BackgroundShellApplicationLoader::BackgroundLoader {
  public:
   explicit BackgroundLoader(ApplicationLoader* loader) : loader_(loader) {}
   ~BackgroundLoader() {}
 
   void Load(ApplicationManager* manager,
             const GURL& url,
             ScopedMessagePipeHandle shell_handle) {
     scoped_refptr<LoadCallbacks> callbacks(
         new ApplicationLoader::SimpleLoadCallbacks(shell_handle.Pass()));
     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:
   ApplicationLoader* loader_;  // Owned by BackgroundShellApplicationLoader
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundLoader);
 };
 
 BackgroundShellApplicationLoader::BackgroundShellApplicationLoader(
     scoped_ptr<ApplicationLoader> real_loader,
@@ skipping 35 matching lines @@
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &BackgroundShellApplicationLoader::LoadOnBackgroundThread,
           base::Unretained(this),
           manager,
           url,
           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() {
   base::MessageLoop message_loop(message_loop_type_);
   base::RunLoop loop;
   task_runner_ = message_loop.task_runner();
   quit_closure_ = loop.QuitClosure();
   message_loop_created_.Signal();
   loop.Run();
 
   delete background_loader_;
   background_loader_ = NULL;
   // Destroy |loader_| on the thread it's actually used on.
   loader_.reset();
 }
 
 void BackgroundShellApplicationLoader::LoadOnBackgroundThread(
     ApplicationManager* manager,
     const GURL& url,
     ScopedMessagePipeHandle* shell_handle) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (!background_loader_)
     background_loader_ = new BackgroundLoader(loader_.get());
   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