| Index: content/browser/plugin_browsertest.cc
|
| diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
|
| index 5c17f2912d9972b19af57713ce01f3771dd36b95..e749095ddc4ff01b8d1c2e043ce9392a6719f608 100644
|
| --- a/content/browser/plugin_browsertest.cc
|
| +++ b/content/browser/plugin_browsertest.cc
|
| @@ -24,7 +24,7 @@
|
| namespace content {
|
| namespace {
|
|
|
| -void SetUrlRequestMock(const FilePath& path) {
|
| +void SetUrlRequestMock(const base::FilePath& path) {
|
| URLRequestMockHTTPJob::AddUrlHandler(path);
|
| }
|
|
|
| @@ -59,7 +59,7 @@ class PluginTest : public ContentBrowserTest {
|
| "security_tests.dll");
|
| }
|
| #elif defined(OS_MACOSX)
|
| - FilePath plugin_dir;
|
| + base::FilePath plugin_dir;
|
| PathService::Get(base::DIR_MODULE, &plugin_dir);
|
| plugin_dir = plugin_dir.AppendASCII("plugins");
|
| // The plugins directory isn't read by default on the Mac, so it needs to be
|
| @@ -69,7 +69,7 @@ class PluginTest : public ContentBrowserTest {
|
| }
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| - FilePath path = GetTestFilePath("", "");
|
| + base::FilePath path = GetTestFilePath("", "");
|
| BrowserThread::PostTask(
|
| BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
|
| }
|
| @@ -105,7 +105,7 @@ class PluginTest : public ContentBrowserTest {
|
| }
|
|
|
| void TestPlugin(const char* filename) {
|
| - FilePath path = GetTestFilePath("plugin", filename);
|
| + base::FilePath path = GetTestFilePath("plugin", filename);
|
| if (!file_util::PathExists(path)) {
|
| const testing::TestInfo* const test_info =
|
| testing::UnitTest::GetInstance()->current_test_info();
|
| @@ -174,8 +174,8 @@ IN_PROC_BROWSER_TEST_F(PluginTest,
|
| // Flaky, http://crbug.com/60071.
|
| IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) {
|
| GURL url(URLRequestMockHTTPJob::GetMockUrl(
|
| - FilePath().AppendASCII("npapi").
|
| - AppendASCII("plugin_url_request_404.html")));
|
| + base::FilePath().AppendASCII("npapi").
|
| + AppendASCII("plugin_url_request_404.html")));
|
| LoadAndWait(url);
|
| }
|
|
|
| @@ -349,8 +349,8 @@ IN_PROC_BROWSER_TEST_F(PluginTest, MultipleInstancesSyncCalls) {
|
|
|
| IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequestFailWrite) {
|
| GURL url(URLRequestMockHTTPJob::GetMockUrl(
|
| - FilePath().AppendASCII("npapi").
|
| - AppendASCII("plugin_url_request_fail_write.html")));
|
| + base::FilePath().AppendASCII("npapi").
|
| + AppendASCII("plugin_url_request_fail_write.html")));
|
| LoadAndWait(url);
|
| }
|
|
|
| @@ -372,8 +372,8 @@ IN_PROC_BROWSER_TEST_F(PluginTest, NoHangIfInitCrashes) {
|
| // If this flakes on Mac, use http://crbug.com/111508
|
| IN_PROC_BROWSER_TEST_F(PluginTest, PluginReferrerTest) {
|
| GURL url(URLRequestMockHTTPJob::GetMockUrl(
|
| - FilePath().AppendASCII("npapi").
|
| - AppendASCII("plugin_url_request_referrer_test.html")));
|
| + base::FilePath().AppendASCII("npapi").
|
| + AppendASCII("plugin_url_request_referrer_test.html")));
|
| LoadAndWait(url);
|
| }
|
|
|
|
|