diff options
| author | rockot <rockot@chromium.org> | 2015-11-12 17:33:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 01:34:47 +0000 |
| commit | 85dce086001825a2faa4e75755a669f5e08a1cad (patch) | |
| tree | 722de1d974f799b3d1ee1ca4c81bb8b0fa75a95d /sql | |
| parent | 415b73b1a400a994a86e6f29709aa0271e895dd5 (diff) | |
| download | chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.zip chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.gz chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.bz2 | |
Move third_party/mojo/src/mojo/public to mojo/public
BUG=None
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1410053006
Cr-Commit-Position: refs/heads/master@{#359461}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mojo/BUILD.gn | 2 | ||||
| -rw-r--r-- | sql/mojo/DEPS | 1 | ||||
| -rw-r--r-- | sql/mojo/mojo_vfs.cc | 2 | ||||
| -rw-r--r-- | sql/mojo/sql_test_base.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/sql/mojo/BUILD.gn b/sql/mojo/BUILD.gn index 18feaec..0ce00d87 100644 --- a/sql/mojo/BUILD.gn +++ b/sql/mojo/BUILD.gn @@ -53,10 +53,10 @@ mojo_native_application("apptests") { "//components/filesystem/public/interfaces", "//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:test_support", + "//mojo/public/cpp/bindings", "//sql", "//sql:redirection_header", "//sql:test_support", "//testing/gtest:gtest", - "//third_party/mojo/src/mojo/public/cpp/bindings", ] } diff --git a/sql/mojo/DEPS b/sql/mojo/DEPS index 23304c8..be63411 100644 --- a/sql/mojo/DEPS +++ b/sql/mojo/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+mojo/application", "+mojo/public", "+mojo/util", - "+third_party/mojo/src/mojo/public", ] diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc index e2fe138..943f38b 100644 --- a/sql/mojo/mojo_vfs.cc +++ b/sql/mojo/mojo_vfs.cc @@ -11,8 +11,8 @@ #include "components/filesystem/public/interfaces/file.mojom.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "components/filesystem/public/interfaces/types.mojom.h" +#include "mojo/public/cpp/bindings/lib/template_util.h" #include "mojo/util/capture_util.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/lib/template_util.h" #include "third_party/sqlite/sqlite3.h" using mojo::Capture; diff --git a/sql/mojo/sql_test_base.h b/sql/mojo/sql_test_base.h index 11131d4..d39198d 100644 --- a/sql/mojo/sql_test_base.h +++ b/sql/mojo/sql_test_base.h @@ -9,9 +9,9 @@ #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 "sql/connection.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" namespace sql { |