| Index: cc/test/paths.cc
|
| diff --git a/ui/gfx/gfx_paths.cc b/cc/test/paths.cc
|
| similarity index 80%
|
| copy from ui/gfx/gfx_paths.cc
|
| copy to cc/test/paths.cc
|
| index 6fe47892ad560bf69a79445bcacc2b0bcf30ec0d..3551afb8aad564bf191110c9e065ef9e6ceac09c 100644
|
| --- a/ui/gfx/gfx_paths.cc
|
| +++ b/cc/test/paths.cc
|
| @@ -1,15 +1,15 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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 "ui/gfx/gfx_paths.h"
|
| +#include "cc/test/paths.h"
|
|
|
| -#include "base/command_line.h"
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| #include "base/path_service.h"
|
|
|
| -namespace gfx {
|
| +namespace cc {
|
| +namespace test {
|
|
|
| bool PathProvider(int key, FilePath* result) {
|
| FilePath cur;
|
| @@ -20,8 +20,7 @@ bool PathProvider(int key, 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("cc"));
|
| cur = cur.Append(FILE_PATH_LITERAL("test"));
|
| cur = cur.Append(FILE_PATH_LITERAL("data"));
|
| if (!file_util::PathExists(cur)) // we don't want to create this
|
| @@ -41,4 +40,5 @@ void RegisterPathProvider() {
|
| PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
|
| }
|
|
|
| -} // namespace gfx
|
| +} // namespace test
|
| +} // namespace cc
|
|
|