diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:56:47 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:56:47 +0000 |
commit | 5a145436666621448c8eafab5006413986137934 (patch) | |
tree | 76f165cabc2d6e4b3fa396598b435fceabae621d /chrome/test/ui/mouseleave_uitest.cc | |
parent | df0a0bfe0ea219ede803adfd600d95584d6e8c0d (diff) | |
download | chromium_src-5a145436666621448c8eafab5006413986137934.zip chromium_src-5a145436666621448c8eafab5006413986137934.tar.gz chromium_src-5a145436666621448c8eafab5006413986137934.tar.bz2 |
Merge UiTest::GetTest* and ui_test_utils::GetTest*. Convert these utility functions to use FilePaths.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1567009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/mouseleave_uitest.cc')
-rw-r--r-- | chrome/test/ui/mouseleave_uitest.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/chrome/test/ui/mouseleave_uitest.cc b/chrome/test/ui/mouseleave_uitest.cc index be647b2..29e4f1c 100644 --- a/chrome/test/ui/mouseleave_uitest.cc +++ b/chrome/test/ui/mouseleave_uitest.cc @@ -2,24 +2,15 @@ // 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/string_util.h" -#include "base/values.h" -#include "chrome/browser/view_ids.h" -#include "chrome/common/chrome_paths.h" -#include "chrome/common/chrome_switches.h" +#include "base/file_path.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" -#include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_test.h" +#include "chrome/test/ui_test_utils.h" #include "gfx/point.h" #include "gfx/rect.h" #include "googleurl/src/gurl.h" -#include "net/base/net_util.h" -#include "views/event.h" #if defined(OS_MACOSX) // window->GetViewBounds is not implemented @@ -45,7 +36,9 @@ class MouseLeaveTest : public UITest { }; TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) { - GURL test_url = GetTestUrl(L"", L"mouseleave.html"); + GURL test_url = ui_test_utils::GetTestUrl( + FilePath(FilePath::kCurrentDirectory), + FilePath(FILE_PATH_LITERAL("mouseleave.html"))); scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0); ASSERT_TRUE(browser.get()); |