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

Unified Diff: sql/connection_unittest.cc

Issue 1306863006: [sqlite] Respect the gyp and gn component switch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 months 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
« no previous file with comments | « sql/BUILD.gn ('k') | sql/proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/connection_unittest.cc
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc
index df35dd10d08233effde856ce9608d24fed37541f..aa9dbeb969850aa1a25fedc87e752d0ce20bea26 100644
--- a/sql/connection_unittest.cc
+++ b/sql/connection_unittest.cc
@@ -12,7 +12,6 @@
#include "sql/connection.h"
#include "sql/correct_sql_test_base.h"
#include "sql/meta_table.h"
-#include "sql/proxy.h"
#include "sql/statement.h"
#include "sql/test/error_callback_support.h"
#include "sql/test/scoped_error_ignorer.h"
@@ -86,12 +85,12 @@ class ScopedScalarFunction {
int args,
base::Callback<void(sqlite3_context*,int,sqlite3_value**)> cb)
: db_(db.db_), function_name_(function_name), cb_(cb) {
- sql::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8,
- this, &Run, NULL, NULL, NULL);
+ ::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8,
+ this, &Run, NULL, NULL, NULL);
}
~ScopedScalarFunction() {
- sql::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8,
- NULL, NULL, NULL, NULL, NULL);
+ ::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8,
+ NULL, NULL, NULL, NULL, NULL);
}
private:
@@ -115,10 +114,10 @@ class ScopedCommitHook {
base::Callback<int(void)> cb)
: db_(db.db_),
cb_(cb) {
- sql::sqlite3_commit_hook(db_, &Run, this);
+ ::sqlite3_commit_hook(db_, &Run, this);
}
~ScopedCommitHook() {
- sql::sqlite3_commit_hook(db_, NULL, NULL);
+ ::sqlite3_commit_hook(db_, NULL, NULL);
}
private:
« no previous file with comments | « sql/BUILD.gn ('k') | sql/proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698