Move app/sql/* files to sql/ directory.

I can't remove app/app.gyp and app/app_base.gypi yet because they are referenced
by third_party gyp files :(

BUG=72317
TEST=None

R=rsesek@chromium.org

move app/sql to sql

Review URL: http://codereview.chromium.org/7353026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93069 0039d316-1c4b-4281-b951-d872f2087c98

91 files changed, 207 insertions, 248 deletions

diff --git a/app/DEPS b/app/DEPS
deleted file mode 100644
index bc667cc..0000000
--- a/app/DEPS
+++ /dev/null
@@ -1,11 +0,0 @@
-include_rules = [
-  "+grit/app_locale_settings.h",
-  "+grit/app_strings.h",
-  "+net",
-  "+skia",
-  "+third_party/mozilla",
-  "+ui",
-
-  "-chrome",
-  "-third_party/WebKit",
-]
diff --git a/app/PRESUBMIT.py b/app/PRESUBMIT.py
deleted file mode 100755
index ed0cbd1..0000000
--- a/app/PRESUBMIT.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (c) 2009 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.
-
-"""Makes sure that the app/ code is cpplint clean."""
-
-INCLUDE_CPP_FILES_ONLY = (
-  r'.*\.cc$', r'.*\.h$'
-)
-
-EXCLUDE = (
-  # Autogenerated window resources files are off limits
-  r'.*resource.h$',
-)
-
-def CheckChangeOnUpload(input_api, output_api):
-  results = []
-  black_list = input_api.DEFAULT_BLACK_LIST + EXCLUDE
-  sources = lambda x: input_api.FilterSourceFile(
-    x, white_list=INCLUDE_CPP_FILES_ONLY, black_list=black_list)
-  results.extend(input_api.canned_checks.CheckChangeLintsClean(
-      input_api, output_api, sources))
-  return results
-
-def GetPreferredTrySlaves():
-  return ['win', 'linux', 'linux_view', 'linux_chromeos', 'mac']
diff --git a/app/app.gyp b/app/app.gyp
index 0f37bd7..514c28c 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -19,11 +19,11 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'run_all_unittests.cc',
-        'sql/connection_unittest.cc',
-        'sql/sqlite_features_unittest.cc',
-        'sql/statement_unittest.cc',
-        'sql/transaction_unittest.cc',
+        '../sql/run_all_unittests.cc',
+        '../sql/connection_unittest.cc',
+        '../sql/sqlite_features_unittest.cc',
+        '../sql/statement_unittest.cc',
+        '../sql/transaction_unittest.cc',
       ],
       'include_dirs': [
         '..',
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 7dfe477..18b5efe 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -15,16 +15,16 @@
         '../third_party/sqlite/sqlite.gyp:sqlite',
       ],
       'sources': [
-        'sql/connection.cc',
-        'sql/connection.h',
-        'sql/diagnostic_error_delegate.h',
-        'sql/init_status.h',
-        'sql/meta_table.cc',
-        'sql/meta_table.h',
-        'sql/statement.cc',
-        'sql/statement.h',
-        'sql/transaction.cc',
-        'sql/transaction.h',
+        '../sql/connection.cc',
+        '../sql/connection.h',
+        '../sql/diagnostic_error_delegate.h',
+        '../sql/init_status.h',
+        '../sql/meta_table.cc',
+        '../sql/meta_table.h',
+        '../sql/statement.cc',
+        '../sql/statement.h',
+        '../sql/transaction.cc',
+        '../sql/transaction.h',
       ],
     },
   ],
diff --git a/build/all.gyp b/build/all.gyp
index f607f97..6bd6c7c 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -9,7 +9,6 @@
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
       'dependencies': [
-        '../app/app.gyp:*',
         '../base/base.gyp:*',
         '../chrome/browser/sync/tools/sync_tools.gyp:*',
         '../chrome/chrome.gyp:*',
diff --git a/chrome/DEPS b/chrome/DEPS
index fc892e1..3186b7d 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -1,10 +1,10 @@
 include_rules = [
-  "+app",
   "+content",
   "+crypto",
   "+gpu",
   "+net",
   "+printing",
+  "+sql",
   "+views",
 
   # The subdirectories in chrome/ will manually allow their own include
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 71f656d..686a2c31 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -4,9 +4,6 @@
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
-#include "app/sql/connection.h"
-#include "app/sql/diagnostic_error_delegate.h"
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ -16,6 +13,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "sql/connection.h"
+#include "sql/diagnostic_error_delegate.h"
+#include "sql/statement.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/database/database_tracker.h"
diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc
index 08a742f..b5f8bfc 100644
--- a/chrome/browser/history/archived_database.cc
+++ b/chrome/browser/history/archived_database.cc
@@ -1,13 +1,13 @@
-// 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 <algorithm>
 #include <string>
 
-#include "app/sql/transaction.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/archived_database.h"
+#include "sql/transaction.h"
 
 namespace history {
 
diff --git a/chrome/browser/history/archived_database.h b/chrome/browser/history/archived_database.h
index 9568aa5..7303d35 100644
--- a/chrome/browser/history/archived_database.h
+++ b/chrome/browser/history/archived_database.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,12 +6,12 @@
 #define CHROME_BROWSER_HISTORY_ARCHIVED_DATABASE_H_
 #pragma once
 
-#include "app/sql/connection.h"
-#include "app/sql/init_status.h"
-#include "app/sql/meta_table.h"
 #include "base/basictypes.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/visit_database.h"
+#include "sql/connection.h"
+#include "sql/init_status.h"
+#include "sql/meta_table.h"
 
 class FilePath;
 
diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc
index 0f8dca6..4f4bfac 100644
--- a/chrome/browser/history/download_database.cc
+++ b/chrome/browser/history/download_database.cc
@@ -7,12 +7,12 @@
 #include <limits>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/history/download_history_info.h"
+#include "sql/statement.h"
 
 // Download schema:
 //
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 131ef95..06008de 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -9,7 +9,6 @@
 #include <set>
 #include <vector>
 
-#include "app/sql/init_status.h"
 #include "base/basictypes.h"
 #include "base/callback_old.h"
 #include "base/file_path.h"
@@ -25,6 +24,7 @@
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/page_transition_types.h"
+#include "sql/init_status.h"
 
 class BookmarkService;
 struct DownloadHistoryInfo;
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 9b3edc3..9b8d175 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <utility>
 
-#include "app/sql/init_status.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/mru_cache.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/browser/history/visit_tracker.h"
 #include "chrome/browser/search_engines/template_url_id.h"
+#include "sql/init_status.h"
 
 class BookmarkService;
 struct DownloadHistoryInfo;
diff --git a/chrome/browser/history/history_database.cc b/chrome/browser/history/history_database.cc
index c1ed0c9..32c2cc3 100644
--- a/chrome/browser/history/history_database.cc
+++ b/chrome/browser/history/history_database.cc
@@ -7,13 +7,14 @@
 #include <algorithm>
 #include <set>
 #include <string>
-#include "app/sql/transaction.h"
+
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
+#include "sql/transaction.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index 6bc53d8..f40e9f3 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,9 +6,6 @@
 #define CHROME_BROWSER_HISTORY_HISTORY_DATABASE_H_
 #pragma once
 
-#include "app/sql/connection.h"
-#include "app/sql/init_status.h"
-#include "app/sql/meta_table.h"
 #include "build/build_config.h"
 #include "chrome/browser/history/download_database.h"
 #include "chrome/browser/history/history_types.h"
@@ -16,6 +13,9 @@
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/visit_database.h"
 #include "chrome/browser/history/visitsegment_database.h"
+#include "sql/connection.h"
+#include "sql/init_status.h"
+#include "sql/meta_table.h"
 
 class FilePath;
 
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 9d8f097..a28d14c 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -22,8 +22,6 @@
 #include <algorithm>
 #include <string>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -50,6 +48,8 @@
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
diff --git a/chrome/browser/history/history_unittest_base.cc b/chrome/browser/history/history_unittest_base.cc
index ccce4f1..2a5a761 100644
--- a/chrome/browser/history/history_unittest_base.cc
+++ b/chrome/browser/history/history_unittest_base.cc
@@ -4,11 +4,11 @@
 
 #include <vector>
 
-#include "app/sql/connection.h"
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "chrome/browser/history/history_unittest_base.h"
+#include "sql/connection.h"
 
 namespace history {
 
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index 27e1091..f6121d4 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_database.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
 #pragma once
 
-#include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "chrome/browser/history/url_database.h"
+#include "sql/connection.h"
 
 class FilePath;
 
diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h
index 5d01dbc..44ad146 100644
--- a/chrome/browser/history/in_memory_url_index.h
+++ b/chrome/browser/history/in_memory_url_index.h
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/autocomplete/history_provider_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_url_index_cache.pb.h"
+#include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class Profile;
diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc
index 2819ce6..776e18f 100644
--- a/chrome/browser/history/in_memory_url_index_unittest.cc
+++ b/chrome/browser/history/in_memory_url_index_unittest.cc
@@ -8,9 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -18,9 +15,12 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/in_memory_database.h"
+#include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/common/chrome_paths.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The test version of the history url database table ('url') is contained in
diff --git a/chrome/browser/history/multipart_uitest.cc b/chrome/browser/history/multipart_uitest.cc
index b54a6d1..8cbf46b 100644
--- a/chrome/browser/history/multipart_uitest.cc
+++ b/chrome/browser/history/multipart_uitest.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/test/ui/ui_test.h"
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "net/test/test_server.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 
 namespace {
 
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index e75c013..36ae56a 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/history/starred_url_database.h"
 
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
+#include "sql/statement.h"
 
 // The following table is used to store star (aka bookmark) information. This
 // class derives from URLDatabase, which has its own schema.
diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc
index cb65645..bb70fc7 100644
--- a/chrome/browser/history/text_database.cc
+++ b/chrome/browser/history/text_database.cc
@@ -8,15 +8,15 @@
 
 #include "chrome/browser/history/text_database.h"
 
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 
 // There are two tables in each database, one full-text search (FTS) table which
 // indexes the contents and title of the pages. The other is a regular SQLITE
diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h
index 9fb3c0d..1b4749e 100644
--- a/chrome/browser/history/text_database.h
+++ b/chrome/browser/history/text_database.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -9,13 +9,13 @@
 #include <set>
 #include <vector>
 
-#include "app/sql/connection.h"
-#include "app/sql/meta_table.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "chrome/browser/history/history_types.h"
 #include "googleurl/src/gurl.h"
+#include "sql/connection.h"
+#include "sql/meta_table.h"
 
 namespace history {
 
diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc
index bd9e736..6e9da20 100644
--- a/chrome/browser/history/text_database_manager_unittest.cc
+++ b/chrome/browser/history/text_database_manager_unittest.cc
@@ -2,13 +2,13 @@
 // 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/visit_database.h"
+#include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index e9d5730..7f06c3d 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -7,19 +7,19 @@
 #include <algorithm>
 #include <string>
 
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/time.h"
 #include "base/string_util.h"
+#include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/thumbnail_score.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h
index 279a31b..78a47553 100644
--- a/chrome/browser/history/thumbnail_database.h
+++ b/chrome/browser/history/thumbnail_database.h
@@ -8,13 +8,13 @@
 
 #include <vector>
 
-#include "app/sql/connection.h"
-#include "app/sql/init_status.h"
-#include "app/sql/meta_table.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/history/history_types.h"
+#include "sql/connection.h"
+#include "sql/init_status.h"
+#include "sql/meta_table.h"
 
 class FilePath;
 class RefCountedMemory;
diff --git a/chrome/browser/history/top_sites_database.cc b/chrome/browser/history/top_sites_database.cc
index 4b19ab7..b481932 100644
--- a/chrome/browser/history/top_sites_database.cc
+++ b/chrome/browser/history/top_sites_database.cc
@@ -2,8 +2,6 @@
 // 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/transaction.h"
 #include "base/file_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ -11,6 +9,8 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/top_sites_database.h"
+#include "sql/connection.h"
+#include "sql/transaction.h"
 
 namespace history {
 
diff --git a/chrome/browser/history/top_sites_database.h b/chrome/browser/history/top_sites_database.h
index bc9cf34..77f176f 100644
--- a/chrome/browser/history/top_sites_database.h
+++ b/chrome/browser/history/top_sites_database.h
@@ -9,11 +9,11 @@
 #include <map>
 #include <string>
 
-#include "app/sql/meta_table.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/url_database.h"  // For DBCloseScoper.
+#include "sql/meta_table.h"
 
 class FilePath;
 class RefCountedMemory;
diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc
index 0a36aef..4b31c10 100644
--- a/chrome/browser/history/url_database.cc
+++ b/chrome/browser/history/url_database.cc
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/i18n/case_conversion.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
+#include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace history {
diff --git a/chrome/browser/history/url_database.h b/chrome/browser/history/url_database.h
index c21d925..b6be207 100644
--- a/chrome/browser/history/url_database.h
+++ b/chrome/browser/history/url_database.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,10 +6,10 @@
 #define CHROME_BROWSER_HISTORY_URL_DATABASE_H_
 #pragma once
 
-#include "app/sql/statement.h"
 #include "base/basictypes.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url_id.h"
+#include "sql/statement.h"
 
 class GURL;
 
diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc
index 7197bdb..cccd827 100644
--- a/chrome/browser/history/url_database_unittest.cc
+++ b/chrome/browser/history/url_database_unittest.cc
@@ -2,7 +2,6 @@
 // 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -10,6 +9,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/url_database.h"
+#include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc
index 1427e78..a8b23f3 100644
--- a/chrome/browser/history/visit_database.cc
+++ b/chrome/browser/history/visit_database.cc
@@ -9,12 +9,12 @@
 #include <map>
 #include <set>
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/page_transition_types.h"
+#include "sql/statement.h"
 
 // Rows, in order, of the visit table.
 #define HISTORY_VISIT_ROW_FIELDS \
diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc
index eb7e8c9..b8cde8f 100644
--- a/chrome/browser/history/visit_database_unittest.cc
+++ b/chrome/browser/history/visit_database_unittest.cc
@@ -2,7 +2,6 @@
 // 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -10,6 +9,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/visit_database.h"
+#include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc
index f4c4f9f..f0b04a9 100644
--- a/chrome/browser/history/visitsegment_database.cc
+++ b/chrome/browser/history/visitsegment_database.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -10,12 +10,12 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/page_usage_data.h"
+#include "sql/statement.h"
 
 // The following tables are used to store url segment information.
 //
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index fbccd93..876d770 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -6,8 +6,6 @@
 
 #include <set>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ -26,6 +24,8 @@
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "webkit/glue/password_form.h"
 
 namespace {
diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc
index 277e0a4..d837c20 100644
--- a/chrome/browser/importer/nss_decryptor.cc
+++ b/chrome/browser/importer/nss_decryptor.cc
@@ -7,13 +7,13 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "webkit/glue/password_form.h"
 
 #if defined(USE_NSS)
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm
index f4bbfd1..93e4a5e 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/browser/importer/safari_importer.mm
@@ -9,7 +9,6 @@
 #include <map>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
@@ -24,6 +23,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
+#include "sql/statement.h"
 
 namespace {
 
diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm
index edd5c50..bb51b91 100644
--- a/chrome/browser/importer/safari_importer_unittest.mm
+++ b/chrome/browser/importer/safari_importer_unittest.mm
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/importer/safari_importer.h"
 
-#include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
+#include "sql/connection.h"
 #include "testing/platform_test.h"
 
 // In order to test the Safari import functionality effectively, we store a
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc
index 0afa5e9..7e8b238 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.cc
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc
@@ -6,9 +6,6 @@
 
 #include <list>
 
-#include "app/sql/meta_table.h"
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -22,6 +19,9 @@
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
+#include "sql/meta_table.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 
 using base::Time;
 
diff --git a/chrome/browser/password_manager/login_database.cc b/chrome/browser/password_manager/login_database.cc
index a7c26b4..47e0193 100644
--- a/chrome/browser/password_manager/login_database.cc
+++ b/chrome/browser/password_manager/login_database.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -7,14 +7,14 @@
 #include <algorithm>
 #include <limits>
 
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 
 using webkit_glue::PasswordForm;
 
diff --git a/chrome/browser/password_manager/login_database.h b/chrome/browser/password_manager/login_database.h
index f4fe724..e91078d 100644
--- a/chrome/browser/password_manager/login_database.h
+++ b/chrome/browser/password_manager/login_database.h
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/connection.h"
-#include "app/sql/meta_table.h"
 #include "base/file_path.h"
 #include "base/string16.h"
+#include "sql/connection.h"
+#include "sql/meta_table.h"
 #include "webkit/glue/password_form.h"
 
 // Interface to the database storage of login information, intended as a helper
diff --git a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
index e69a59d..be48a4e 100644
--- a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
+++ b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
@@ -56,7 +56,6 @@
 #include <fstream>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -67,11 +66,12 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
-#include "crypto/sha2.h"
 #include "chrome/browser/safe_browsing/bloom_filter.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/chrome_paths.h"
+#include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index d9dd131e..634797e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -4,8 +4,6 @@
 //
 // Unit tests for the SafeBrowsing storage system.
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -17,6 +15,8 @@
 #include "content/browser/browser_thread.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index a53798f..892298a5 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -20,6 +18,8 @@
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest-param-test.h"
 
 namespace syncable {
diff --git a/chrome/browser/sync/util/user_settings_unittest.cc b/chrome/browser/sync/util/user_settings_unittest.cc
index 0aa57d4..027875d 100644
--- a/chrome/browser/sync/util/user_settings_unittest.cc
+++ b/chrome/browser/sync/util/user_settings_unittest.cc
@@ -5,7 +5,6 @@
 #include <limits>
 #include <string>
 
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
@@ -13,6 +12,7 @@
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/util/user_settings.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::numeric_limits;
diff --git a/chrome/browser/webdata/autofill_table.cc b/chrome/browser/webdata/autofill_table.cc
index 8e5242a..ff687c7 100644
--- a/chrome/browser/webdata/autofill_table.cc
+++ b/chrome/browser/webdata/autofill_table.cc
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/common/guid.h"
+#include "sql/statement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/form_field.h"
 
diff --git a/chrome/browser/webdata/autofill_table_unittest.cc b/chrome/browser/webdata/autofill_table_unittest.cc
index 536437d..a7c4655 100644
--- a/chrome/browser/webdata/autofill_table_unittest.cc
+++ b/chrome/browser/webdata/autofill_table_unittest.cc
@@ -4,13 +4,11 @@
 
 #include <vector>
 
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/credit_card.h"
@@ -18,7 +16,9 @@
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/web_database.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/guid.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 8a10bb0..c7d2a7f 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/webdata/keyword_table.h"
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ -12,6 +11,7 @@
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "googleurl/src/gurl.h"
+#include "sql/statement.h"
 
 using base::Time;
 
diff --git a/chrome/browser/webdata/logins_table.cc b/chrome/browser/webdata/logins_table.cc
index cfa28aa..a1dc2ba 100644
--- a/chrome/browser/webdata/logins_table.cc
+++ b/chrome/browser/webdata/logins_table.cc
@@ -7,9 +7,9 @@
 #include <limits>
 #include <string>
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "chrome/browser/password_manager/encryptor.h"
+#include "sql/statement.h"
 #include "webkit/glue/password_form.h"
 
 using webkit_glue::PasswordForm;
diff --git a/chrome/browser/webdata/logins_table_win.cc b/chrome/browser/webdata/logins_table_win.cc
index 3445f42..581c176 100644
--- a/chrome/browser/webdata/logins_table_win.cc
+++ b/chrome/browser/webdata/logins_table_win.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/webdata/logins_table.h"
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/ie7_password.h"
+#include "sql/statement.h"
 
 bool LoginsTable::AddIE7Login(const IE7PasswordInfo& info) {
   sql::Statement s(db_->GetUniqueStatement(
diff --git a/chrome/browser/webdata/token_service_table.cc b/chrome/browser/webdata/token_service_table.cc
index 8567112..6d9a737 100644
--- a/chrome/browser/webdata/token_service_table.cc
+++ b/chrome/browser/webdata/token_service_table.cc
@@ -7,9 +7,9 @@
 #include <map>
 #include <string>
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "chrome/browser/password_manager/encryptor.h"
+#include "sql/statement.h"
 
 bool TokenServiceTable::Init() {
   if (!db_->DoesTableExist("token_service")) {
diff --git a/chrome/browser/webdata/web_apps_table.cc b/chrome/browser/webdata/web_apps_table.cc
index 2b8812c..7df48f7 100644
--- a/chrome/browser/webdata/web_apps_table.cc
+++ b/chrome/browser/webdata/web_apps_table.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/webdata/web_apps_table.h"
 
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "chrome/browser/history/history_database.h"
 #include "googleurl/src/gurl.h"
+#include "sql/statement.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 2f3c430..a120001 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -10,12 +10,12 @@
 #include <string>
 #include <vector>
 
-#include "app/sql/init_status.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "content/browser/browser_thread.h"
+#include "sql/init_status.h"
 
 class AutofillChange;
 class AutofillProfile;
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index e868f7d..dabf5e1 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "content/common/notification_service.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 
 namespace {
 
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index e743f38..ed21e12 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -6,15 +6,15 @@
 #define CHROME_BROWSER_WEBDATA_WEB_DATABASE_H_
 #pragma once
 
-#include "app/sql/connection.h"
-#include "app/sql/init_status.h"
-#include "app/sql/meta_table.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
+#include "sql/connection.h"
+#include "sql/init_status.h"
+#include "sql/meta_table.h"
 
 class FilePath;
 class NotificationService;
diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc
index 61dcc61..4f4d1bd 100644
--- a/chrome/browser/webdata/web_database_migration_unittest.cc
+++ b/chrome/browser/webdata/web_database_migration_unittest.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
@@ -22,6 +21,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/guid.h"
 #include "chrome/test/ui_test_utils.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/webdata/web_database_table.h b/chrome/browser/webdata/web_database_table.h
index ea3c5ec..feb60fd 100644
--- a/chrome/browser/webdata/web_database_table.h
+++ b/chrome/browser/webdata/web_database_table.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_WEBDATA_WEB_DATABASE_TABLE_H_
 #pragma once
 
-#include "app/sql/connection.h"
-#include "app/sql/init_status.h"
-#include "app/sql/meta_table.h"
+#include "sql/connection.h"
+#include "sql/init_status.h"
+#include "sql/meta_table.h"
 
 // An abstract base class representing a table within a WebDatabase.
 // Each table should subclass this, adding type-specific methods as needed.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2235bc3..df4d661 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1384,6 +1384,7 @@
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
+            '../sql/sql.gyp:*',
             '../testing/gmock.gyp:*',
             '../testing/gtest.gyp:*',
             '../third_party/bsdiff/bsdiff.gyp:*',
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 052e510..6e0138c 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/test/automation/proxy_launcher.h"
 
-#include "app/sql/connection.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
@@ -19,13 +18,14 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/test_switches.h"
-#include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/child_process_info.h"
 #include "content/common/debug_flags.h"
+#include "sql/connection.h"
 
 namespace {
 
diff --git a/media/DEPS b/media/DEPS
index a1dfd37..235859c 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
-  "+app/gfx/gl",
   "+third_party/ffmpeg",
   "+third_party/openmax",
   "+ui/gfx",
+  "+ui/gfx/gl",
 ]
diff --git a/app/sql/DEPS b/sql/DEPS
index 0f76c3a..0f76c3a 100644
--- a/app/sql/DEPS
+++ b/sql/DEPS
diff --git a/app/sql/connection.cc b/sql/connection.cc
index 09eea45..3f63301 100644
--- a/app/sql/connection.cc
+++ b/sql/connection.cc
@@ -2,16 +2,16 @@
 // 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 "sql/connection.h"
 
 #include <string.h>
 
-#include "app/sql/statement.h"
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "sql/statement.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace {
diff --git a/app/sql/connection.h b/sql/connection.h
index d82b8b8..5807e36 100644
--- a/app/sql/connection.h
+++ b/sql/connection.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APP_SQL_CONNECTION_H_
-#define APP_SQL_CONNECTION_H_
+#ifndef SQL_CONNECTION_H_
+#define SQL_CONNECTION_H_
 #pragma once
 
 #include <map>
@@ -384,4 +384,4 @@ class Connection {
 
 }  // namespace sql
 
-#endif  // APP_SQL_CONNECTION_H_
+#endif  // SQL_CONNECTION_H_
diff --git a/app/sql/connection_unittest.cc b/sql/connection_unittest.cc
index 2c1a5a0..e99bff7 100644
--- a/app/sql/connection_unittest.cc
+++ b/sql/connection_unittest.cc
@@ -2,10 +2,10 @@
 // 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/file_util.h"
 #include "base/scoped_temp_dir.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
diff --git a/app/sql/diagnostic_error_delegate.h b/sql/diagnostic_error_delegate.h
index 713c4aa..70677bd 100644
--- a/app/sql/diagnostic_error_delegate.h
+++ b/sql/diagnostic_error_delegate.h
@@ -1,14 +1,14 @@
-// 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.
 
-#ifndef APP_SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
-#define APP_SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
+#ifndef SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
+#define SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
 #pragma once
 
-#include "app/sql/connection.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "sql/connection.h"
 
 namespace sql {
 
@@ -47,4 +47,4 @@ class DiagnosticErrorDelegate : public ErrorDelegate {
 
 }  // namespace sql
 
-#endif  // APP_SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
+#endif  // SQL_DIAGNOSTIC_ERROR_DELEGATE_H_
diff --git a/app/sql/init_status.h b/sql/init_status.h
index 048c5e8..b9f87e0 100644
--- a/app/sql/init_status.h
+++ b/sql/init_status.h
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/app/sql/meta_table.cc b/sql/meta_table.cc
index 2700d67..c4736ef 100644
--- a/app/sql/meta_table.cc
+++ b/sql/meta_table.cc
@@ -1,13 +1,13 @@
-// 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/meta_table.h"
+#include "sql/meta_table.h"
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 
 namespace sql {
 
diff --git a/app/sql/meta_table.h b/sql/meta_table.h
index d5c76c8..4a640d8 100644
--- a/app/sql/meta_table.h
+++ b/sql/meta_table.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef APP_SQL_META_TABLE_H_
-#define APP_SQL_META_TABLE_H_
+#ifndef SQL_META_TABLE_H_
+#define SQL_META_TABLE_H_
 #pragma once
 
 #include <string>
@@ -80,4 +80,4 @@ class MetaTable {
 
 }  // namespace sql
 
-#endif  // APP_SQL_META_TABLE_H_
+#endif  // SQL_META_TABLE_H_
diff --git a/app/run_all_unittests.cc b/sql/run_all_unittests.cc
index 7fd6ef2..7fd6ef2 100644
--- a/app/run_all_unittests.cc
+++ b/sql/run_all_unittests.cc
diff --git a/sql/sql.gyp b/sql/sql.gyp
index e5681ce..ac87444 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -15,16 +15,16 @@
         '../third_party/sqlite/sqlite.gyp:sqlite',
       ],
       'sources': [
-        '../app/sql/connection.cc',
-        '../app/sql/connection.h',
-        '../app/sql/diagnostic_error_delegate.h',
-        '../app/sql/init_status.h',
-        '../app/sql/meta_table.cc',
-        '../app/sql/meta_table.h',
-        '../app/sql/statement.cc',
-        '../app/sql/statement.h',
-        '../app/sql/transaction.cc',
-        '../app/sql/transaction.h',
+        'connection.cc',
+        'connection.h',
+        'diagnostic_error_delegate.h',
+        'init_status.h',
+        'meta_table.cc',
+        'meta_table.h',
+        'statement.cc',
+        'statement.h',
+        'transaction.cc',
+        'transaction.h',
       ],
     },
     {
@@ -36,11 +36,11 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        '../app/run_all_unittests.cc',
-        '../app/sql/connection_unittest.cc',
-        '../app/sql/sqlite_features_unittest.cc',
-        '../app/sql/statement_unittest.cc',
-        '../app/sql/transaction_unittest.cc',
+        'run_all_unittests.cc',
+        'connection_unittest.cc',
+        'sqlite_features_unittest.cc',
+        'statement_unittest.cc',
+        'transaction_unittest.cc',
       ],
       'include_dirs': [
         '..',
diff --git a/app/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc
index 0ee63be..a25413d 100644
--- a/app/sql/sqlite_features_unittest.cc
+++ b/sql/sqlite_features_unittest.cc
@@ -4,11 +4,11 @@
 
 #include <string>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
diff --git a/app/sql/statement.cc b/sql/statement.cc
index 07be3d3..8f75693 100644
--- a/app/sql/statement.cc
+++ b/sql/statement.cc
@@ -1,8 +1,8 @@
-// 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 "app/sql/statement.h"
+#include "sql/statement.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
diff --git a/app/sql/statement.h b/sql/statement.h
index 6bf3949..dbb96713 100644
--- a/app/sql/statement.h
+++ b/sql/statement.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APP_SQL_STATEMENT_H_
-#define APP_SQL_STATEMENT_H_
+#ifndef SQL_STATEMENT_H_
+#define SQL_STATEMENT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
-#include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
+#include "sql/connection.h"
 
 namespace sql {
 
@@ -164,4 +164,4 @@ class Statement {
 
 }  // namespace sql
 
-#endif  // APP_SQL_STATEMENT_H_
+#endif  // SQL_STATEMENT_H_
diff --git a/app/sql/statement_unittest.cc b/sql/statement_unittest.cc
index 0085d7c..1d10fe0 100644
--- a/app/sql/statement_unittest.cc
+++ b/sql/statement_unittest.cc
@@ -4,10 +4,10 @@
 
 #include <string>
 
-#include "app/sql/connection.h"
-#include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
diff --git a/app/sql/transaction.cc b/sql/transaction.cc
index 10bcfb0..06bcbeb 100644
--- a/app/sql/transaction.cc
+++ b/sql/transaction.cc
@@ -1,11 +1,11 @@
-// 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 "app/sql/transaction.h"
+#include "sql/transaction.h"
 
-#include "app/sql/connection.h"
 #include "base/logging.h"
+#include "sql/connection.h"
 
 namespace sql {
 
diff --git a/app/sql/transaction.h b/sql/transaction.h
index c65ca8d..5e1a418 100644
--- a/app/sql/transaction.h
+++ b/sql/transaction.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef APP_SQL_TRANSACTION_H_
-#define APP_SQL_TRANSACTION_H_
+#ifndef SQL_TRANSACTION_H_
+#define SQL_TRANSACTION_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -54,4 +54,4 @@ class Transaction {
 
 }  // namespace sql
 
-#endif  // APP_SQL_TRANSACTION_H_
+#endif  // SQL_TRANSACTION_H_
diff --git a/app/sql/transaction_unittest.cc b/sql/transaction_unittest.cc
index 3d42a31..f306a5c 100644
--- a/app/sql/transaction_unittest.cc
+++ b/sql/transaction_unittest.cc
@@ -2,11 +2,11 @@
 // 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 "app/sql/transaction.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
+#include "sql/connection.h"
+#include "sql/statement.h"
+#include "sql/transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
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",
 ]