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/browser/sessions | |
| 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/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_browsertest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index c75d3cb..b9440cb0 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/defaults.h" +#include "base/file_path.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" +#include "chrome/browser/defaults.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" @@ -24,7 +25,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, if (browser_defaults::kRestorePopups) return; - GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html")); + const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); + GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), + FilePath(kTitle1File))); ui_test_utils::NavigateToURL(browser(), url); // Turn on session restore. |