summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 10:27:36 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 10:27:36 +0000
commit0fcb72bdf0ccbe5daa1540c3027d3bfbfff68c4c (patch)
tree27c9c4546f4a392e7f5073086477881581e3be83
parentdea5f3d9e963bd08429b290b8c1492b2f11dcf84 (diff)
downloadchromium_src-0fcb72bdf0ccbe5daa1540c3027d3bfbfff68c4c.zip
chromium_src-0fcb72bdf0ccbe5daa1540c3027d3bfbfff68c4c.tar.gz
chromium_src-0fcb72bdf0ccbe5daa1540c3027d3bfbfff68c4c.tar.bz2
Fix win build errors. Don't initialize FilePath with const char*.
BUG=None TEST=Build should turn green Review URL: http://codereview.chromium.org/2834066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53321 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/device_orientation/enable_switch_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/device_orientation/enable_switch_browsertest.cc b/chrome/browser/device_orientation/enable_switch_browsertest.cc
index debbdf54..ee3303c 100644
--- a/chrome/browser/device_orientation/enable_switch_browsertest.cc
+++ b/chrome/browser/device_orientation/enable_switch_browsertest.cc
@@ -12,8 +12,8 @@
class DeviceOrientationEnableSwitchTest : public InProcessBrowserTest {
public:
- GURL testUrl(const char* filename) {
- const FilePath kTestDir("device_orientation");
+ GURL testUrl(const FilePath::CharType* filename) {
+ const FilePath kTestDir(FILE_PATH_LITERAL("device_orientation"));
return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
}
};
@@ -27,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(DeviceOrientationEnableSwitchTest, UnavailabilityTest) {
ASSERT_FALSE(has_switch) << "This test does not make sense if "
<< "--enable-device-orientation is set.";
- GURL test_url = testUrl("enable_switch_test.html");
+ GURL test_url = testUrl(FILE_PATH_LITERAL("enable_switch_test.html"));
ui_test_utils::NavigateToURL(browser(), test_url);
std::string status = browser()->GetSelectedTabContents()->GetURL().ref();
EXPECT_EQ("pass", status) << "Page detected device orientation properties.";