OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/tools/test_shell/simple_database_system.h" | 5 #include "webkit/tools/test_shell/simple_database_system.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/utf_string_conversions.h" |
10 #include "third_party/sqlite/preprocessed/sqlite3.h" | 11 #include "third_party/sqlite/preprocessed/sqlite3.h" |
11 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" | 12 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" |
12 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" | 13 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" |
13 #include "webkit/database/database_util.h" | 14 #include "webkit/database/database_util.h" |
14 #include "webkit/database/vfs_backend.h" | 15 #include "webkit/database/vfs_backend.h" |
15 | 16 |
16 using webkit_database::DatabaseTracker; | 17 using webkit_database::DatabaseTracker; |
17 using webkit_database::DatabaseUtil; | 18 using webkit_database::DatabaseUtil; |
18 using webkit_database::VfsBackend; | 19 using webkit_database::VfsBackend; |
19 | 20 |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 | 183 |
183 FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile( | 184 FilePath SimpleDatabaseSystem::GetFullFilePathForVfsFile( |
184 const string16& vfs_file_name) { | 185 const string16& vfs_file_name) { |
185 if (vfs_file_name.empty()) // temp file, used for vacuuming | 186 if (vfs_file_name.empty()) // temp file, used for vacuuming |
186 return FilePath(); | 187 return FilePath(); |
187 | 188 |
188 AutoLock file_names_auto_lock(file_names_lock_); | 189 AutoLock file_names_auto_lock(file_names_lock_); |
189 DCHECK(file_names_.find(vfs_file_name) != file_names_.end()); | 190 DCHECK(file_names_.find(vfs_file_name) != file_names_.end()); |
190 return file_names_[vfs_file_name]; | 191 return file_names_[vfs_file_name]; |
191 } | 192 } |
OLD | NEW |