Revert of [sqlite] Respect the gyp and gn component switch.

sql/connection_unittest.cc

Index: sql/connection_unittest.cc
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc
index aa9dbeb969850aa1a25fedc87e752d0ce20bea26..df35dd10d08233effde856ce9608d24fed37541f 100644
--- a/sql/connection_unittest.cc
+++ b/sql/connection_unittest.cc
@@ -12,6 +12,7 @@
 #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"
@@ -85,12 +86,12 @@
       int args,
       base::Callback<void(sqlite3_context*,int,sqlite3_value**)> cb)
       : db_(db.db_), function_name_(function_name), cb_(cb) {
-    ::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8,
-                                 this, &Run, NULL, NULL, NULL);
+    sql::sqlite3_create_function_v2(db_, function_name, args, SQLITE_UTF8,
+                                    this, &Run, NULL, NULL, NULL);
   }
   ~ScopedScalarFunction() {
-    ::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8,
-                                 NULL, NULL, NULL, NULL, NULL);
+    sql::sqlite3_create_function_v2(db_, function_name_, 0, SQLITE_UTF8,
+                                    NULL, NULL, NULL, NULL, NULL);
   }
 
  private:
@@ -114,10 +115,10 @@
                    base::Callback<int(void)> cb)
       : db_(db.db_),
         cb_(cb) {
-    ::sqlite3_commit_hook(db_, &Run, this);
+    sql::sqlite3_commit_hook(db_, &Run, this);
   }
   ~ScopedCommitHook() {
-    ::sqlite3_commit_hook(db_, NULL, NULL);
+    sql::sqlite3_commit_hook(db_, NULL, NULL);
   }
 
  private: