Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / application_manager / background_shell_application_loader.cc

diff --git a/src/mojo/application_manager/background_shell_application_loader.cc b/src/mojo/application_manager/background_shell_application_loader.cc
index 33b7e69..e6664db 100644 (file)
--- a/src/mojo/application_manager/background_shell_application_loader.cc
+++ b/src/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:
@@ -67,7 +67,7 @@ void BackgroundShellApplicationLoader::Load(
     thread_.reset(new base::DelegateSimpleThread(this, thread_name_));
     thread_->Start();
     message_loop_created_.Wait();
-    DCHECK(task_runner_);
+    DCHECK(task_runner_.get());
   }
 
   task_runner_->PostTask(
@@ -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