Use base namespace for FilePath in content/browser

content/browser/plugin_browsertest.cc

 // 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_switches.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
 
 namespace content {
 namespace {
 
-void SetUrlRequestMock(const FilePath& path) {
+void SetUrlRequestMock(const base::FilePath& path) {
   URLRequestMockHTTPJob::AddUrlHandler(path);
 }
 
 }
 
 class PluginTest : public ContentBrowserTest {
  protected:
   PluginTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
@@ skipping 14 matching lines @@
       }
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
       // the new plugin.
       command_line->AppendSwitch(switches::kUseOldWMPPlugin);
     } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
       command_line->AppendSwitchASCII(switches::kTestSandbox,
                                       "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
     // explicitly registered.
     command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir);
 #endif
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    FilePath path = GetTestFilePath("", "");
+    base::FilePath path = GetTestFilePath("", "");
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
   }
 
   static void LoadAndWaitInWindow(Shell* window, const GURL& url) {
     string16 expected_title(ASCIIToUTF16("OK"));
     TitleWatcher title_watcher(window->web_contents(), expected_title);
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
     NavigateToURL(window, url);
@@ skipping 15 matching lines @@
   GURL GetURL(const char* filename) {
     return GetTestUrl("npapi", filename);
   }
 
   void NavigateAway() {
     GURL url = GetTestUrl("", "simple_page.html");
     LoadAndWait(url);
   }
 
   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();
       LOG(INFO) << "PluginTest." << test_info->name() <<
                    " not running because test data wasn't found.";
       return;
     }
 
     GURL url = GetTestUrl("plugin", filename);
     LoadAndWait(url);
@@ skipping 48 matching lines @@
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
   SimulateMouseClick(shell()->web_contents(), 0,
       WebKit::WebMouseEvent::ButtonLeft);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
 
 // 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);
 }
 
 // Tests if a plugin executing a self deleting script using Invoke with
 // a modal dialog showing works without crashing or hanging
 // Disabled, flakily exceeds timeout, http://crbug.com/46257.
 IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
   // Navigate asynchronously because if we waitd until it completes, there's a
   // race condition where the alert can come up before we start watching for it.
   shell()->LoadURL(GetURL("self_delete_plugin_invoke_alert.html"));
@@ skipping 153 matching lines @@
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // Test a browser hang due to special case of multiple
 // plugin instances indulged in sync calls across renderer.
 IN_PROC_BROWSER_TEST_F(PluginTest, MultipleInstancesSyncCalls) {
   LoadAndWait(GetURL("multiple_instances_sync_calls.html"));
 }
 #endif
 
 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);
 }
 
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(PluginTest, EnsureScriptingWorksInDestroy) {
   LoadAndWait(GetURL("ensure_scripting_works_in_destroy.html"));
 }
 
 // This test uses a Windows Event to signal to the plugin that it should crash
 // on NP_Initialize.
 IN_PROC_BROWSER_TEST_F(PluginTest, NoHangIfInitCrashes) {
   HANDLE crash_event = CreateEvent(NULL, TRUE, FALSE, L"TestPluginCrashOnInit");
   SetEvent(crash_event);
   LoadAndWait(GetURL("no_hang_if_init_crashes.html"));
   CloseHandle(crash_event);
 }
 #endif
 
 // 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);
 }
 
 #if defined(OS_MACOSX)
 // Test is flaky, see http://crbug.com/134515.
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) {
   gfx::Rect bounds(50, 50, 400, 400);
   SetWindowBounds(shell()->window(), bounds);
 
   NavigateToURL(shell(), GetURL("convert_point.html"));
@@ skipping 63 matching lines @@
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
   TestPlugin("Java.html");
 }
 
 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) {
   TestPlugin("silverlight.html");
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content