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

Side by Side Diff: chrome/browser/sync/util/sqlite_utils.cc

Issue 8496002: Sync: Improve handling of database load failures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Many improvements and scope expansion 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/sync/util/sqlite_utils.h" 5 #include "chrome/browser/sync/util/sqlite_utils.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 15 matching lines...) Expand all
26 return error_; 26 return error_;
27 } 27 }
28 protected: 28 protected:
29 int error_; 29 int error_;
30 }; 30 };
31 31
32 class DebugSQLErrorHandler: public VanillaSQLErrorHandler { 32 class DebugSQLErrorHandler: public VanillaSQLErrorHandler {
33 public: 33 public:
34 virtual int HandleError(int error, sqlite3* db) { 34 virtual int HandleError(int error, sqlite3* db) {
35 error_ = error; 35 error_ = error;
36 NOTREACHED() << "sqlite error " << error 36 LOG(ERROR) << "sqlite error " << error
37 << " " << sqlite3_errmsg(db) 37 << " " << sqlite3_errmsg(db)
38 << " db " << static_cast<void*>(db); 38 << " db " << static_cast<void*>(db);
39 return error; 39 return error;
40 } 40 }
41 }; 41 };
42 42
43 class ReleaseSQLErrorHandler : public VanillaSQLErrorHandler { 43 class ReleaseSQLErrorHandler : public VanillaSQLErrorHandler {
44 public: 44 public:
45 virtual int HandleError(int error, sqlite3* db) { 45 virtual int HandleError(int error, sqlite3* db) {
46 error_ = error; 46 error_ = error;
47 // Used to have a CHECK here. Got lots of crashes. 47 // Used to have a CHECK here. Got lots of crashes.
48 return error; 48 return error;
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 return (s != NULL); 502 return (s != NULL);
503 } 503 }
504 504
505 std::wstring SQLStatement::column_wstring(int index) { 505 std::wstring SQLStatement::column_wstring(int index) {
506 std::wstring wstr; 506 std::wstring wstr;
507 column_wstring(index, &wstr); 507 column_wstring(index, &wstr);
508 return wstr; 508 return wstr;
509 } 509 }
510 510
511 } // namespace sqlite_utils 511 } // namespace sqlite_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698