summaryrefslogtreecommitdiffstats
path: root/sql
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
commita3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch)
treebdd4dac76e6034ef6cf33450e203269a715ea0e6 /sql
parent8bc574c57115e9ffd0169f33131c0865997dcb35 (diff)
downloadchromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes. Review URL: https://codereview.chromium.org/12163003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql')
-rw-r--r--sql/connection.cc2
-rw-r--r--sql/connection.h7
-rw-r--r--sql/connection_unittest.cc2
3 files changed, 7 insertions, 4 deletions
diff --git a/sql/connection.cc b/sql/connection.cc
index aefac60..5c0c15d 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -128,7 +128,7 @@ Connection::~Connection() {
Close();
}
-bool Connection::Open(const FilePath& path) {
+bool Connection::Open(const base::FilePath& path) {
#if defined(OS_WIN)
return OpenInternal(WideToUTF8(path.value()));
#elif defined(OS_POSIX)
diff --git a/sql/connection.h b/sql/connection.h
index 2722ffd..fa7c99d 100644
--- a/sql/connection.h
+++ b/sql/connection.h
@@ -17,10 +17,13 @@
#include "base/time.h"
#include "sql/sql_export.h"
-class FilePath;
struct sqlite3;
struct sqlite3_stmt;
+namespace base {
+class FilePath;
+}
+
namespace sql {
class Statement;
@@ -154,7 +157,7 @@ class SQL_EXPORT Connection {
// Initializes the SQL connection for the given file, returning true if the
// file could be opened. You can call this or OpenInMemory.
- bool Open(const FilePath& path) WARN_UNUSED_RESULT;
+ bool Open(const base::FilePath& path) WARN_UNUSED_RESULT;
// Initializes the SQL connection for a temporary in-memory database. There
// will be no associated file on disk, and the initial database will be
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc
index e8f454f..3ed2093 100644
--- a/sql/connection_unittest.cc
+++ b/sql/connection_unittest.cc
@@ -25,7 +25,7 @@ class SQLConnectionTest : public testing::Test {
sql::Connection& db() { return db_; }
- FilePath db_path() {
+ base::FilePath db_path() {
return temp_dir_.path().AppendASCII("SQLConnectionTest.db");
}