| Index: content/public/test/test_mojo_app.cc
|
| diff --git a/content/public/test/test_mojo_app.cc b/content/public/test/test_mojo_app.cc
|
| index cc8017506bb16aed88dbc396ec086b7f16a2cf22..ae85e71313795a7ad5e0b54214b1c7c96948d217 100644
|
| --- a/content/public/test/test_mojo_app.cc
|
| +++ b/content/public/test/test_mojo_app.cc
|
| @@ -8,23 +8,18 @@
|
|
|
| #include "base/logging.h"
|
| #include "mojo/shell/public/cpp/connection.h"
|
| -#include "mojo/shell/public/cpp/shell.h"
|
| +#include "mojo/shell/public/cpp/connector.h"
|
|
|
| namespace content {
|
|
|
| const char kTestMojoAppUrl[] = "system:content_mojo_test";
|
|
|
| -TestMojoApp::TestMojoApp() : service_binding_(this), shell_(nullptr) {
|
| +TestMojoApp::TestMojoApp() : service_binding_(this) {
|
| }
|
|
|
| TestMojoApp::~TestMojoApp() {
|
| }
|
|
|
| -void TestMojoApp::Initialize(mojo::Shell* shell, const std::string& url,
|
| - uint32_t id, uint32_t user_id) {
|
| - shell_ = shell;
|
| -}
|
| -
|
| bool TestMojoApp::AcceptConnection(mojo::Connection* connection) {
|
| requestor_url_ = GURL(connection->GetRemoteApplicationURL());
|
| connection->AddInterface<TestMojoService>(this);
|
| @@ -39,8 +34,6 @@ void TestMojoApp::Create(mojo::Connection* connection,
|
|
|
| void TestMojoApp::DoSomething(const DoSomethingCallback& callback) {
|
| callback.Run();
|
| - DCHECK(shell_);
|
| - shell_->Quit();
|
| }
|
|
|
| void TestMojoApp::GetRequestorURL(const GetRequestorURLCallback& callback) {
|
|
|