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

sql/connection_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/test/histogram_tester.h"
 #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"
 #include "sql/test/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/sqlite/sqlite3.h"
 
 namespace sql {
 namespace test {
 
@@ skipping 53 matching lines @@
 
 // Allow a test to add a SQLite function in a scoped context.
 class ScopedScalarFunction {
  public:
   ScopedScalarFunction(
       sql::Connection& db,
       const char* function_name,
       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:
   static void Run(sqlite3_context* context, int argc, sqlite3_value** argv) {
     ScopedScalarFunction* t = static_cast<ScopedScalarFunction*>(
         sqlite3_user_data(context));
     t->cb_.Run(context, argc, argv);
   }
 
   sqlite3* db_;
   const char* function_name_;
   base::Callback<void(sqlite3_context*,int,sqlite3_value**)> cb_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedScalarFunction);
 };
 
 // Allow a test to add a SQLite commit hook in a scoped context.
 class ScopedCommitHook {
  public:
   ScopedCommitHook(sql::Connection& db,
                    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:
   static int Run(void* p) {
     ScopedCommitHook* t = static_cast<ScopedCommitHook*>(p);
     return t->cb_.Run();
   }
 
   sqlite3* db_;
   base::Callback<int(void)> cb_;
@@ skipping 1161 matching lines @@
   samples = tester.GetHistogramSamplesSinceCreation(kCommitTime);
   ASSERT_TRUE(samples);
   // 100 for commit adjust, 1 for measuring COMMIT.
   EXPECT_EQ(101, samples->sum());
 
   samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime);
   EXPECT_EQ(0, samples->sum());
 }
 
 }  // namespace