Monster FilePath patch!

chrome/browser/views/constrained_window_impl_interactive_uitest.cc

 // Copyright (c) 2006-2008 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 "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/constrained_window_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 14 matching lines @@
     ASSERT_TRUE(browser_.get());
 
     window_.reset(browser_->GetWindow());
     ASSERT_TRUE(window_.get());
 
     tab_.reset(browser_->GetTab(0));
     ASSERT_TRUE(tab_.get());
   }
 
   void NavigateMainTabTo(const std::wstring& file_name) {
-    std::wstring filename(test_data_directory_);
-    file_util::AppendToPath(&filename, L"constrained_files");
-    file_util::AppendToPath(&filename, file_name);
+    FilePath filename(FilePath::FromWStringHack(test_data_directory_));
+    filename = filename.AppendASCII("constrained_files");
+    filename = filename.Append(FilePath::FromWStringHack(file_name));
     ASSERT_TRUE(tab_->NavigateToURL(net::FilePathToFileURL(filename)));
   }
 
   void SimulateClickInCenterOf(const scoped_ptr<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
@@ skipping 194 matching lines @@
 TEST_F(InteractiveConstrainedWindowTest, DontBreakOnBlur) {
   NavigateMainTabTo(L"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));
 }