Index: sql/test/paths.cc |
diff --git a/ui/gfx/gfx_paths.cc b/sql/test/paths.cc |
similarity index 80% |
copy from ui/gfx/gfx_paths.cc |
copy to sql/test/paths.cc |
index 3d53dfd1a1b9f2ded8a7ad6a0a63f9a9cbe773bf..c186e6e3058e33fe6556f2a5d9c97079bbe2f68b 100644 |
--- a/ui/gfx/gfx_paths.cc |
+++ b/sql/test/paths.cc |
@@ -1,15 +1,17 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2014 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 "ui/gfx/gfx_paths.h" |
+#include "sql/test/paths.h" |
-#include "base/command_line.h" |
#include "base/file_util.h" |
#include "base/files/file_path.h" |
#include "base/path_service.h" |
-namespace gfx { |
+namespace sql { |
+namespace test { |
+ |
+namespace { |
bool PathProvider(int key, base::FilePath* result) { |
base::FilePath cur; |
@@ -20,8 +22,7 @@ bool PathProvider(int key, base::FilePath* result) { |
case DIR_TEST_DATA: |
if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) |
return false; |
- cur = cur.Append(FILE_PATH_LITERAL("ui")); |
- cur = cur.Append(FILE_PATH_LITERAL("gfx")); |
+ cur = cur.Append(FILE_PATH_LITERAL("sql")); |
cur = cur.Append(FILE_PATH_LITERAL("test")); |
cur = cur.Append(FILE_PATH_LITERAL("data")); |
if (!base::PathExists(cur)) // we don't want to create this |
@@ -35,10 +36,13 @@ bool PathProvider(int key, base::FilePath* result) { |
return true; |
} |
+} // namespace |
+ |
// This cannot be done as a static initializer sadly since Visual Studio will |
// eliminate this object file if there is no direct entry point into it. |
void RegisterPathProvider() { |
PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
} |
-} // namespace gfx |
+} // namespace test |
+} // namespace sql |