summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/DEPS4
-rw-r--r--webkit/appcache/appcache_database.cc12
-rw-r--r--webkit/appcache/appcache_database_unittest.cc2
-rw-r--r--webkit/appcache/appcache_storage_impl.cc4
-rw-r--r--webkit/database/database_tracker.cc10
-rw-r--r--webkit/database/databases_table.cc4
-rw-r--r--webkit/database/databases_table_unittest.cc6
-rw-r--r--webkit/database/quota_table.cc4
-rw-r--r--webkit/database/quota_table_unittest.cc6
-rw-r--r--webkit/glue/DEPS1
-rw-r--r--webkit/quota/quota_database.cc10
-rw-r--r--webkit/quota/quota_database_unittest.cc8
-rw-r--r--webkit/support/DEPS1
-rw-r--r--webkit/tools/test_shell/DEPS1
14 files changed, 35 insertions, 38 deletions
diff --git a/webkit/DEPS b/webkit/DEPS
index e6a4621..b7578b8 100644
--- a/webkit/DEPS
+++ b/webkit/DEPS
@@ -15,10 +15,10 @@ include_rules = [
"+ui/gfx",
# For databases/
- "+app/sql",
+ "+sql",
# For gpu/
- "+app/gfx",
+ "+ui/gfx",
"+gpu/command_buffer/client",
"+gpu/command_buffer/common",
"+gpu/command_buffer/service",
diff --git a/webkit/appcache/appcache_database.cc b/webkit/appcache/appcache_database.cc
index d754beb..ffcd9a2 100644
--- a/webkit/appcache/appcache_database.cc
+++ b/webkit/appcache/appcache_database.cc
@@ -1,18 +1,18 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "webkit/appcache/appcache_database.h"
-#include "app/sql/connection.h"
-#include "app/sql/diagnostic_error_delegate.h"
-#include "app/sql/meta_table.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
#include "base/auto_reset.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "sql/connection.h"
+#include "sql/diagnostic_error_delegate.h"
+#include "sql/meta_table.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
#include "webkit/appcache/appcache_entry.h"
#include "webkit/appcache/appcache_histograms.h"
diff --git a/webkit/appcache/appcache_database_unittest.cc b/webkit/appcache/appcache_database_unittest.cc
index 4119994..8f82314 100644
--- a/webkit/appcache/appcache_database_unittest.cc
+++ b/webkit/appcache/appcache_database_unittest.cc
@@ -4,9 +4,9 @@
#include "testing/gtest/include/gtest/gtest.h"
-#include "app/sql/connection.h"
#include "base/file_util.h"
#include "base/scoped_temp_dir.h"
+#include "sql/connection.h"
#include "webkit/appcache/appcache_database.h"
#include "webkit/appcache/appcache_entry.h"
diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc
index 6b7d04d..6429e35 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/appcache/appcache_storage_impl.cc
@@ -6,8 +6,6 @@
#include <set>
-#include "app/sql/connection.h"
-#include "app/sql/transaction.h"
#include "base/file_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -15,6 +13,8 @@
#include "base/string_util.h"
#include "net/base/cache_type.h"
#include "net/base/net_errors.h"
+#include "sql/connection.h"
+#include "sql/transaction.h"
#include "webkit/appcache/appcache.h"
#include "webkit/appcache/appcache_database.h"
#include "webkit/appcache/appcache_entry.h"
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index d01acda..742d3f3 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -7,11 +7,6 @@
#include <algorithm>
#include <vector>
-#include "app/sql/connection.h"
-#include "app/sql/diagnostic_error_delegate.h"
-#include "app/sql/meta_table.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/message_loop_proxy.h"
@@ -19,6 +14,11 @@
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "net/base/net_errors.h"
+#include "sql/connection.h"
+#include "sql/diagnostic_error_delegate.h"
+#include "sql/meta_table.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
#include "webkit/database/database_quota_client.h"
#include "webkit/database/database_util.h"
#include "webkit/database/databases_table.h"
diff --git a/webkit/database/databases_table.cc b/webkit/database/databases_table.cc
index fd174ce..ec77917 100644
--- a/webkit/database/databases_table.cc
+++ b/webkit/database/databases_table.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "webkit/database/databases_table.h"
-#include "app/sql/statement.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "sql/statement.h"
namespace webkit_database {
diff --git a/webkit/database/databases_table_unittest.cc b/webkit/database/databases_table_unittest.cc
index 65ac2ef..da22440 100644
--- a/webkit/database/databases_table_unittest.cc
+++ b/webkit/database/databases_table_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/database/databases_table.h"
diff --git a/webkit/database/quota_table.cc b/webkit/database/quota_table.cc
index fd5813f..e9065ef 100644
--- a/webkit/database/quota_table.cc
+++ b/webkit/database/quota_table.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "webkit/database/quota_table.h"
-#include "app/sql/statement.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "sql/statement.h"
namespace webkit_database {
diff --git a/webkit/database/quota_table_unittest.cc b/webkit/database/quota_table_unittest.cc
index de051f4..492c7b9 100644
--- a/webkit/database/quota_table_unittest.cc
+++ b/webkit/database/quota_table_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2009 The Chromium Authos. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/database/quota_table.h"
diff --git a/webkit/glue/DEPS b/webkit/glue/DEPS
index e4479d5..8c66cf7 100644
--- a/webkit/glue/DEPS
+++ b/webkit/glue/DEPS
@@ -1,5 +1,4 @@
include_rules = [
- "+app",
"+gpu",
"+media",
"+skia/ext",
diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc
index e1637b2..c9f2056 100644
--- a/webkit/quota/quota_database.cc
+++ b/webkit/quota/quota_database.cc
@@ -6,16 +6,16 @@
#include <string>
-#include "app/sql/connection.h"
-#include "app/sql/diagnostic_error_delegate.h"
-#include "app/sql/meta_table.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/file_util.h"
#include "base/time.h"
#include "googleurl/src/gurl.h"
+#include "sql/connection.h"
+#include "sql/diagnostic_error_delegate.h"
+#include "sql/meta_table.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
#include "webkit/quota/special_storage_policy.h"
namespace quota {
diff --git a/webkit/quota/quota_database_unittest.cc b/webkit/quota/quota_database_unittest.cc
index e0bc7cf..05001a7 100644
--- a/webkit/quota/quota_database_unittest.cc
+++ b/webkit/quota/quota_database_unittest.cc
@@ -6,15 +6,15 @@
#include <iterator>
#include <set>
-#include "app/sql/connection.h"
-#include "app/sql/meta_table.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
#include "base/scoped_temp_dir.h"
#include "googleurl/src/gurl.h"
+#include "sql/connection.h"
+#include "sql/meta_table.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/quota/mock_special_storage_policy.h"
#include "webkit/quota/quota_database.h"
diff --git a/webkit/support/DEPS b/webkit/support/DEPS
index 7cbc981..55dd2dc 100644
--- a/webkit/support/DEPS
+++ b/webkit/support/DEPS
@@ -1,5 +1,4 @@
include_rules = [
- "+app",
"+media",
"+ui",
]
diff --git a/webkit/tools/test_shell/DEPS b/webkit/tools/test_shell/DEPS
index cce3c4b..4c57ff7 100644
--- a/webkit/tools/test_shell/DEPS
+++ b/webkit/tools/test_shell/DEPS
@@ -1,6 +1,5 @@
include_rules = [
"+mac",
- "+app",
"+third_party/zlib",
"+ui",
]
generated by cgit v1.1 at 2024-11-08 05:09:11 +0000