summaryrefslogtreecommitdiffstats
path: root/sql
diff options
context:
space:
mode:
authorKen Rockot <rockot@chromium.org>2015-11-11 14:24:06 -0800
committerKen Rockot <rockot@chromium.org>2015-11-11 22:26:07 +0000
commitf2bfe56ff56152e21033992105c31437a3b150fe (patch)
tree8e81f342ef2cb5c53ee1f249ebfcb349eab5f1b4 /sql
parentd23c3995cd1439bc28a1254a9e8ff850c833fbf2 (diff)
downloadchromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.zip
chromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.tar.gz
chromium_src-f2bfe56ff56152e21033992105c31437a3b150fe.tar.bz2
Eliminate third_party/mojo/src from all targets' include paths
Eliding presubmit here because the missing DEPS entries are going to be addressed here: https://codereview.chromium.org/1410053006 BUG=554556 R=jam@chromium.org NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1435063002 . Cr-Commit-Position: refs/heads/master@{#359174}
Diffstat (limited to 'sql')
-rw-r--r--sql/mojo/DEPS1
-rw-r--r--sql/mojo/mojo_vfs.cc2
-rw-r--r--sql/mojo/sql_test_base.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/sql/mojo/DEPS b/sql/mojo/DEPS
index be63411..23304c8 100644
--- a/sql/mojo/DEPS
+++ b/sql/mojo/DEPS
@@ -3,4 +3,5 @@ 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 943f38b..e2fe138 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 d39198d..11131d4 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 {