Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: sql/connection.cc

Issue 8690005: Remove 4 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sql/connection.cc
diff --git a/sql/connection.cc b/sql/connection.cc
index bda1d26ccd7bb1761a55a919fb9fd49c7d903812..f7fef120d03deeab9fe6ebd4bb0190ceb428972d 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -19,7 +19,7 @@ namespace {
// Spin for up to a second waiting for the lock to clear when setting
// up the database.
// TODO(shess): Better story on this. http://crbug.com/56559
-const base::TimeDelta kBusyTimeout = base::TimeDelta::FromSeconds(1);
+const int kBusyTimeoutSeconds = 1;
class ScopedBusyTimeout {
public:
@@ -373,6 +373,9 @@ bool Connection::OpenInternal(const std::string& file_name) {
NOTREACHED() << "Could not set locking mode: " << GetErrorMessage();
}
+ const base::TimeDelta kBusyTimeout =
+ base::TimeDelta::FromSeconds(kBusyTimeoutSeconds);
+
if (page_size_ != 0) {
// Enforce SQLite restrictions on |page_size_|.
DCHECK(!(page_size_ & (page_size_ - 1)))

Powered by Google App Engine
This is Rietveld 408576698