diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/diagnostics/sqlite_diagnostics.cc | 2 | ||||
-rw-r--r-- | chrome/browser/renderer_host/database_dispatcher_host.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/syncable/directory_backing_store.cc | 4 | ||||
-rw-r--r-- | chrome/browser/sync/syncable/syncable_unittest.cc | 2 | ||||
-rw-r--r-- | chrome/common/database_util.cc | 2 | ||||
-rw-r--r-- | chrome/common/sqlite_compiled_statement.cc | 2 | ||||
-rw-r--r-- | chrome/common/sqlite_utils.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_thread.cc | 2 |
8 files changed, 9 insertions, 9 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; diff --git a/chrome/common/database_util.cc b/chrome/common/database_util.cc index c62e5fa..412debc 100644 --- a/chrome/common/database_util.cc +++ b/chrome/common/database_util.cc @@ -7,7 +7,7 @@ #include "chrome/common/child_thread.h" #include "chrome/common/render_messages.h" #include "ipc/ipc_sync_message_filter.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebKitClient; diff --git a/chrome/common/sqlite_compiled_statement.cc b/chrome/common/sqlite_compiled_statement.cc index f54182a..19b9e53 100644 --- a/chrome/common/sqlite_compiled_statement.cc +++ b/chrome/common/sqlite_compiled_statement.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/common/sqlite_utils.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" // SqliteStatementCache ------------------------------------------------------- diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h index 12824a6..9b0180c 100644 --- a/chrome/common/sqlite_utils.h +++ b/chrome/common/sqlite_utils.h @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" // forward declarations of classes defined here class FilePath; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 631e5b4..15e244c 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -69,7 +69,7 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_platform_file.h" #include "net/base/net_util.h" -#include "third_party/sqlite/preprocessed/sqlite3.h" +#include "third_party/sqlite/sqlite3.h" #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" #include "third_party/WebKit/WebKit/chromium/public/WebColor.h" |