diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 23:37:03 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 23:37:03 +0000 |
| commit | e33cba46498a40774bc6d33a9258afbd5fa059e6 (patch) | |
| tree | 4ce6b22f4f7b2b245b2d89bb9209a53e3274b263 /chrome/browser | |
| parent | aaf6472fd01db928919d4dc13687bde2a4b5c7b9 (diff) | |
| download | chromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.zip chromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.tar.gz chromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.tar.bz2 | |
Move bundled copy of sqlite one level deeper to better separate it
from our patches, READMEs, etc.
Also, add a shim header so we can use it for building
with system sqlite.
TEST=compile
BUG=22208
Review URL: http://codereview.chromium.org/3108030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc index 768bf70..15c758a 100644 --- a/chrome/browser/diagnostics/sqlite_diagnostics.cc +++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc @@ -16,7 +16,7 @@ #include "base/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/database/database_tracker.h" diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc index 32908fa..b592b1b 100644 --- a/chrome/browser/renderer_host/database_dispatcher_host.cc +++ b/chrome/browser/renderer_host/database_dispatcher_host.cc @@ -18,7 +18,7 @@ #include "chrome/browser/renderer_host/database_permission_request.h" #include "chrome/common/render_messages.h" #include "googleurl/src/gurl.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" #include "webkit/database/database_util.h" #include "webkit/database/vfs_backend.h" diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index 7f82a73..048f016 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -26,7 +26,7 @@ #include "chrome/browser/sync/syncable/syncable_columns.h" #include "chrome/browser/sync/util/crypto_helpers.h" #include "chrome/common/sqlite_utils.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" // Sometimes threads contend on the DB lock itself, especially when one thread // is calling SaveChanges. In the worst case scenario, the user can put his @@ -288,7 +288,7 @@ bool DirectoryBackingStore::BeginLoad() { // Something's gone wrong. Nuke the database and try again. LOG(ERROR) << "Sync database " << backing_filepath_.value() << " corrupt. Deleting and recreating."; - file_util::Delete(backing_filepath_, false);
+ file_util::Delete(backing_filepath_, false); bool failed_again = !OpenAndConfigureHandleHelper(&load_dbhandle_); // Using failed_again here lets us distinguish from cases where corruption diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index 72bea4d..6dfe793 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -35,7 +35,7 @@ #include "chrome/test/sync/engine/test_id_factory.h" #include "chrome/test/sync/engine/test_syncable_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" using browser_sync::TestIdFactory; using std::cout; |