diff options
| author | ben <ben@chromium.org> | 2016-02-06 20:35:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-07 04:36:48 +0000 |
| commit | 3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e (patch) | |
| tree | de412bbb84e68778685e868f2b62d873ffa2937d /sql | |
| parent | d345759c314c478c2b35f5ae6e6fd0698e532d2a (diff) | |
| download | chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.zip chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.tar.gz chromium_src-3a7cbe0bed9f9b81ab1da4ed0e4dba764345977e.tar.bz2 | |
Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.
Also eliminates use of mojo::shell::mojom::Shell in favor of this base interface.
This means most code doesn't have to use ApplicationImpl - only the places that instantiate them.
TBR=rockot@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1674903003
Cr-Commit-Position: refs/heads/master@{#374049}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mojo/sql_test_base.cc | 4 | ||||
| -rw-r--r-- | sql/mojo/vfs_unittest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc index 3086007..ab37af2 100644 --- a/sql/mojo/sql_test_base.cc +++ b/sql/mojo/sql_test_base.cc @@ -8,7 +8,7 @@ #include <stdint.h> #include <utility> -#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/shell.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h" #include "sql/test/test_helpers.h" @@ -137,7 +137,7 @@ void SQLTestBase::TruncateDatabase() { void SQLTestBase::SetUp() { ApplicationTestBase::SetUp(); - application_impl()->ConnectToService("mojo:filesystem", &files_); + shell()->ConnectToService("mojo:filesystem", &files_); filesystem::FileError error = filesystem::FileError::FAILED; filesystem::DirectoryPtr directory; diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index a6a87c4..9bbaf04 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc @@ -8,8 +8,8 @@ #include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" -#include "mojo/shell/public/cpp/application_impl.h" #include "mojo/shell/public/cpp/application_test_base.h" +#include "mojo/shell/public/cpp/shell.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h" #include "testing/gtest/include/gtest/gtest.h" @@ -53,7 +53,7 @@ class VFSTest : public mojo::test::ApplicationTestBase, void SetUp() override { mojo::test::ApplicationTestBase::SetUp(); - application_impl()->ConnectToService("mojo:filesystem", &files_); + shell()->ConnectToService("mojo:filesystem", &files_); filesystem::FileError error = filesystem::FileError::FAILED; filesystem::DirectoryPtr directory; |