diff options
| author | ben <ben@chromium.org> | 2016-01-11 18:44:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-12 02:44:59 +0000 |
| commit | 273c1e30241a8a5509ad9b307380ed8600ba82d8 (patch) | |
| tree | 25da3f1a02f1f9d5f129ba8d794d20b51355a07b /sql | |
| parent | 9c1122c7163411be938195ba546460ba54d33b00 (diff) | |
| download | chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.zip chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.gz chromium_src-273c1e30241a8a5509ad9b307380ed8600ba82d8.tar.bz2 | |
Move mojo/application/public -> mojo/shell/public
TBR=sky@chromium.org
http://crbug.com/575308
Review URL: https://codereview.chromium.org/1565343003
Cr-Commit-Position: refs/heads/master@{#368776}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mojo/BUILD.gn | 6 | ||||
| -rw-r--r-- | sql/mojo/DEPS | 2 | ||||
| -rw-r--r-- | sql/mojo/sql_test_base.cc | 2 | ||||
| -rw-r--r-- | sql/mojo/sql_test_base.h | 2 | ||||
| -rw-r--r-- | sql/mojo/vfs_unittest.cc | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sql/mojo/BUILD.gn b/sql/mojo/BUILD.gn index 0ce00d87..b7a3793 100644 --- a/sql/mojo/BUILD.gn +++ b/sql/mojo/BUILD.gn @@ -19,9 +19,9 @@ source_set("mojo") { "//base", "//base/third_party/dynamic_annotations", "//components/filesystem/public/interfaces", - "//mojo/application/public/cpp", "//mojo/common", "//mojo/platform_handle", + "//mojo/shell/public/cpp", "//third_party/sqlite", ] } @@ -51,9 +51,9 @@ mojo_native_application("apptests") { "//base", "//base/test:test_support", "//components/filesystem/public/interfaces", - "//mojo/application/public/cpp:sources", - "//mojo/application/public/cpp:test_support", "//mojo/public/cpp/bindings", + "//mojo/shell/public/cpp:sources", + "//mojo/shell/public/cpp:test_support", "//sql", "//sql:redirection_header", "//sql:test_support", diff --git a/sql/mojo/DEPS b/sql/mojo/DEPS index be63411..9dd7c02 100644 --- a/sql/mojo/DEPS +++ b/sql/mojo/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/filesystem", - "+mojo/application", + "+mojo/shell", "+mojo/public", "+mojo/util", ] diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc index 1df6096..72aaa64 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/application/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/application_impl.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h" #include "sql/test/test_helpers.h" diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h index 6494752..2fba5aa 100644 --- a/sql/mojo/sql_test_base.h +++ b/sql/mojo/sql_test_base.h @@ -9,8 +9,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" -#include "mojo/application/public/cpp/application_test_base.h" #include "mojo/public/cpp/bindings/binding.h" +#include "mojo/shell/public/cpp/application_test_base.h" #include "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index dc6a1ee..e51f1bd 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/application/public/cpp/application_impl.h" -#include "mojo/application/public/cpp/application_test_base.h" +#include "mojo/shell/public/cpp/application_impl.h" +#include "mojo/shell/public/cpp/application_test_base.h" #include "mojo/util/capture_util.h" #include "sql/mojo/mojo_vfs.h" #include "testing/gtest/include/gtest/gtest.h" |