diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 04:09:12 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 04:09:12 +0000 |
commit | 526b466671fc03ee6592c78a77f194c78122dcd2 (patch) | |
tree | 8e3c243c621a13aa59561681e8be7d5abe7c3326 /sql/sqlite_features_unittest.cc | |
parent | c090470d08860b16f56773c1b198e2ce24e6c907 (diff) | |
download | chromium_src-526b466671fc03ee6592c78a77f194c78122dcd2.zip chromium_src-526b466671fc03ee6592c78a77f194c78122dcd2.tar.gz chromium_src-526b466671fc03ee6592c78a77f194c78122dcd2.tar.bz2 |
Remove sql::ErrorDelegate.
API cleanup. Replaced by ErrorCallback.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/16788002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206299 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql/sqlite_features_unittest.cc')
-rw-r--r-- | sql/sqlite_features_unittest.cc | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/sql/sqlite_features_unittest.cc b/sql/sqlite_features_unittest.cc index 2f6a49e..4fc730c 100644 --- a/sql/sqlite_features_unittest.cc +++ b/sql/sqlite_features_unittest.cc @@ -4,6 +4,7 @@ #include <string> +#include "base/bind.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "sql/connection.h" @@ -15,28 +16,12 @@ namespace { -class StatementErrorHandler : public sql::ErrorDelegate { - public: - StatementErrorHandler(int* error, std::string* sql_text) - : error_(error), - sql_text_(sql_text) {} - - virtual ~StatementErrorHandler() {} - - virtual int OnError(int error, sql::Connection* connection, - sql::Statement* stmt) OVERRIDE { - *error_ = error; - const char* sql_txt = stmt ? stmt->GetSQLStatement() : NULL; - *sql_text_ = sql_txt ? sql_txt : "no statement available"; - return error; - } - - private: - int* error_; - std::string* sql_text_; - - DISALLOW_COPY_AND_ASSIGN(StatementErrorHandler); -}; +void CaptureErrorCallback(int* error_pointer, std::string* sql_text, + int error, sql::Statement* stmt) { + *error_pointer = error; + const char* text = stmt ? stmt->GetSQLStatement() : NULL; + *sql_text = text ? text : "no statement available"; +} class SQLiteFeaturesTest : public testing::Test { public: @@ -48,7 +33,8 @@ class SQLiteFeaturesTest : public testing::Test { // The error delegate will set |error_| and |sql_text_| when any sqlite // statement operation returns an error code. - db_.set_error_delegate(new StatementErrorHandler(&error_, &sql_text_)); + db_.set_error_callback(base::Bind(&CaptureErrorCallback, + &error_, &sql_text_)); } virtual void TearDown() { |