Fix to use FilePath version of PathService::Get....

chrome/browser/blocked_popup_container_interactive_uitest.cc

 // Copyright (c) 2006-2009 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 <string>
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 19 matching lines @@
     browser_ = automation()->GetBrowserWindow(0);
     ASSERT_TRUE(browser_.get());
 
     window_ = browser_->GetWindow();
     ASSERT_TRUE(window_.get());
 
     tab_ = browser_->GetTab(0);
     ASSERT_TRUE(tab_.get());
   }
 
-  void NavigateMainTabTo(const std::wstring& file_name) {
+  void NavigateMainTabTo(const std::string& file_name) {
     FilePath filename(test_data_directory_);
     filename = filename.AppendASCII("constrained_files");
-    filename = filename.Append(FilePath::FromWStringHack(file_name));
+    filename = filename.AppendASCII(file_name);
     ASSERT_TRUE(tab_->NavigateToURL(net::FilePathToFileURL(filename)));
   }
 
   void SimulateClickInCenterOf(const scoped_refptr<WindowProxy>& window) {
     gfx::Rect tab_view_bounds;
     ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER,
                                       &tab_view_bounds, true));
 
     // Simulate a click of the actual link to force user_gesture to be
     // true; if we don't, the resulting popup will be constrained, which
     // isn't what we want to test.
     ASSERT_TRUE(window->SimulateOSClick(tab_view_bounds.CenterPoint(),
                                         views::Event::EF_LEFT_BUTTON_DOWN));
   }
 
   scoped_refptr<BrowserProxy> browser_;
   scoped_refptr<WindowProxy> window_;
   scoped_refptr<TabProxy> tab_;
 };
 
 TEST_F(BlockedPopupContainerInteractiveTest, TestOpenAndResizeTo) {
-  NavigateMainTabTo(L"constrained_window_onload_resizeto.html");
+  NavigateMainTabTo("constrained_window_onload_resizeto.html");
   SimulateClickInCenterOf(window_);
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000));
 
   scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser != NULL);
   scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window != NULL);
 
   // Make sure we were created with the correct width and height.
@@ skipping 57 matching lines @@
     number += title[offset];
     offset++;
   }
 
   return StringToInt(WideToUTF16(number), output);
 }
 
 // Tests that in the window.open() equivalent of a fork bomb, we stop building
 // windows.
 TEST_F(BlockedPopupContainerInteractiveTest, DontSpawnEndlessPopups) {
-  NavigateMainTabTo(L"infinite_popups.html");
+  NavigateMainTabTo("infinite_popups.html");
   SimulateClickInCenterOf(window_);
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000));
 
   scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
   scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
 
   // And now we spin, waiting to make sure that we don't spawn popup
@@ skipping 22 matching lines @@
 
     EXPECT_GE(new_popup_window_count, popup_window_count);
     EXPECT_LE(new_popup_window_count, kMaxPopupWindows);
     popup_window_count = new_popup_window_count;
   }
 }
 
 // Make sure that we refuse to close windows when a constrained popup is
 // displayed.
 TEST_F(BlockedPopupContainerInteractiveTest, WindowOpenWindowClosePopup) {
-  NavigateMainTabTo(L"openclose_main.html");
+  NavigateMainTabTo("openclose_main.html");
   SimulateClickInCenterOf(window_);
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 5000));
 
   // Make sure we have a blocked popup notification
   scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
   scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window.get());
   scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
   ASSERT_TRUE(popup_tab->WaitForBlockedPopupCountToChangeTo(1, 1000));
 
   // Ensure we didn't close the first popup window.
   ASSERT_FALSE(automation()->WaitForWindowCountToBecome(1, 3000));
 }
 
 TEST_F(BlockedPopupContainerInteractiveTest, BlockAlertFromBlockedPopup) {
-  NavigateMainTabTo(L"block_alert.html");
+  NavigateMainTabTo("block_alert.html");
 
   // Wait for there to be an app modal dialog (and fail if it's shown).
   ASSERT_FALSE(automation()->WaitForAppModalDialog(4000));
 
   // Ensure one browser window.
   int browser_window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&browser_window_count));
   ASSERT_EQ(1, browser_window_count);
 
   // Ensure one blocked popup window: the popup didn't escape.
   int popup_count = 0;
   ASSERT_TRUE(tab_->GetBlockedPopupCount(&popup_count));
   ASSERT_EQ(1, popup_count);
 }
 
 TEST_F(BlockedPopupContainerInteractiveTest, ShowAlertFromNormalPopup) {
-  NavigateMainTabTo(L"show_alert.html");
+  NavigateMainTabTo("show_alert.html");
   SimulateClickInCenterOf(window_);
 
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 5000));
 
   scoped_refptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(popup_browser.get());
   scoped_refptr<WindowProxy> popup_window(popup_browser->GetWindow());
   ASSERT_TRUE(popup_window.get());
   scoped_refptr<TabProxy> popup_tab(popup_browser->GetTab(0));
   ASSERT_TRUE(popup_tab.get());
 
 #if defined(OS_LINUX)
   // It seems we have to wait a little bit for the widgets to spin up before
   // we can start clicking on them.
   PlatformThread::Sleep(500);
 #endif
 
   SimulateClickInCenterOf(popup_window);
 
   // Wait for there to be an app modal dialog.
   ASSERT_TRUE(automation()->WaitForAppModalDialog(5000));
 }
 
 // Make sure that window focus works while creating a popup window so that we
 // don't
 TEST_F(BlockedPopupContainerInteractiveTest, DontBreakOnBlur) {
-  NavigateMainTabTo(L"window_blur_test.html");
+  NavigateMainTabTo("window_blur_test.html");
   SimulateClickInCenterOf(window_);
 
   // Wait for the popup window to open.
   ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000));
 
   // We popup shouldn't be closed by the onblur handler.
   ASSERT_FALSE(automation()->WaitForWindowCountToBecome(1, 1500));
 }