[sql] Drop sqlite3_* proxy hacks.

Now that sqlite is a shlib under component build, the hacks to proxy functions are not necessary. BUG=489444 TBR=michaeln@chromium.org Review URL: https://codereview.chromium.org/1303423009 Cr-Commit-Position: refs/heads/master@{#346994}
marcosholgado · Sep 2, 2015 · 6ce9d1f · 6ce9d1f
1 parent 82c93e1
commit 6ce9d1f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 78 deletions.
diff --git a/sql/BUILD.gn b/sql/BUILD.gn
@@ -13,8 +13,6 @@ component("sql") {
     "init_status.h",
     "meta_table.cc",
     "meta_table.h",
-    "proxy.cc",
-    "proxy.h",
     "recovery.cc",
     "recovery.h",
     "statement.cc",

diff --git 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:

diff --git a/sql/proxy.cc b/sql/proxy.cc
diff --git a/sql/proxy.h b/sql/proxy.h
diff --git a/sql/sql.gyp b/sql/sql.gyp
@@ -27,8 +27,6 @@
         'init_status.h',
         'meta_table.cc',
         'meta_table.h',
-        'proxy.cc',
-        'proxy.h',
         'recovery.cc',
         'recovery.h',
         'statement.cc',