Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / shell / shell_test_helper.cc

diff --git a/src/mojo/shell/shell_test_helper.cc b/src/mojo/shell/shell_test_helper.cc
index cec75ce..691fe76 100644 (file)
--- a/src/mojo/shell/shell_test_helper.cc
+++ b/src/mojo/shell/shell_test_helper.cc
@@ -5,28 +5,16 @@
 #include "mojo/shell/shell_test_helper.h"
 
 #include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/path_service.h"
 #include "mojo/shell/init.h"
+#include "net/base/filename_util.h"
 
 namespace mojo {
 namespace shell {
 
-class ShellTestHelper::TestServiceProvider : public ServiceProvider {
- public:
-  TestServiceProvider() {}
-  virtual ~TestServiceProvider() {}
-
-  // ServiceProvider:
-  virtual void ConnectToService(
-      const mojo::String& service_url,
-      const mojo::String& service_name,
-      ScopedMessagePipeHandle client_handle,
-      const mojo::String& requestor_url) OVERRIDE {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestServiceProvider);
-};
-
 ShellTestHelper::ShellTestHelper() {
   base::CommandLine::Init(0, NULL);
   mojo::shell::InitializeLogging();
@@ -36,16 +24,18 @@ ShellTestHelper::~ShellTestHelper() {
 }
 
 void ShellTestHelper::Init() {
-  context_.reset(new Context);
-  test_api_.reset(new ServiceManager::TestAPI(context_->service_manager()));
-  local_service_provider_.reset(new TestServiceProvider);
-  service_provider_.Bind(test_api_->GetServiceProviderHandle().Pass());
-  service_provider_.set_client(local_service_provider_.get());
+  context_.Init();
+  test_api_.reset(
+      new ApplicationManager::TestAPI(context_.application_manager()));
+  base::FilePath service_dir;
+  CHECK(PathService::Get(base::DIR_MODULE, &service_dir));
+  context_.mojo_url_resolver()->SetBaseURL(
+      net::FilePathToFileURL(service_dir));
 }
 
-void ShellTestHelper::SetLoaderForURL(scoped_ptr<ServiceLoader> loader,
+void ShellTestHelper::SetLoaderForURL(scoped_ptr<ApplicationLoader> loader,
                                       const GURL& url) {
-  context_->service_manager()->SetLoaderForURL(loader.Pass(), url);
+  context_.application_manager()->SetLoaderForURL(loader.Pass(), url);
 }
 
 }  // namespace shell