| Index: content/browser/gpu/gpu_memory_test.cc
|
| diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc
|
| index fc62846d10b2a1548b73d9215ce8be24e97fce32..00f7331537cfb855f860894dabdec567e85da288 100644
|
| --- a/content/browser/gpu/gpu_memory_test.cc
|
| +++ b/content/browser/gpu/gpu_memory_test.cc
|
| @@ -74,7 +74,7 @@ class GpuMemoryTest : public content::ContentBrowserTest {
|
| }
|
|
|
| virtual void SetUpInProcessBrowserTestFixture() {
|
| - FilePath test_dir;
|
| + base::FilePath test_dir;
|
| ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir));
|
| gpu_test_dir_ = test_dir.AppendASCII("gpu");
|
| }
|
| @@ -105,7 +105,7 @@ class GpuMemoryTest : public content::ContentBrowserTest {
|
| void LoadPage(content::Shell* tab_to_load,
|
| PageType page_type,
|
| size_t mb_to_use) {
|
| - FilePath url;
|
| + base::FilePath url;
|
| switch (page_type) {
|
| case PAGE_CSS3D:
|
| url = gpu_test_dir_.AppendASCII("mem_css3d.html");
|
| @@ -226,7 +226,7 @@ class GpuMemoryTest : public content::ContentBrowserTest {
|
| std::set<content::Shell*> tabs_;
|
| std::set<content::Shell*> visible_tabs_;
|
| bool has_used_first_shell_;
|
| - FilePath gpu_test_dir_;
|
| + base::FilePath gpu_test_dir_;
|
| };
|
|
|
| // When trying to load something that doesn't fit into our total GPU memory
|
|
|