Index: headless/lib/headless_browser_browsertest.cc |
diff --git a/headless/lib/headless_browser_browsertest.cc b/headless/lib/headless_browser_browsertest.cc |
index 6b0b3b846f720e909b18a64d995745c9a471fc16..625fff431b6aafc80c9536ccb17721da8b14a033 100644 |
--- a/headless/lib/headless_browser_browsertest.cc |
+++ b/headless/lib/headless_browser_browsertest.cc |
@@ -627,9 +627,6 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, SetCookiesWithDevTools) { |
// script. |
#if defined(OS_POSIX) |
Sami
2017/03/22 19:46:25
If this doesn't build on Windows, let's just put t
dvallet
2017/03/27 05:59:50
Done
|
#define MAYBE_RendererCommandPrefixTest RendererCommandPrefixTest |
-#else |
-#define MAYBE_RendererCommandPrefixTest DISABLED_RendererCommandPrefixTest |
-#endif // defined(OS_POSIX) |
IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, MAYBE_RendererCommandPrefixTest) { |
base::ThreadRestrictions::SetIOAllowed(true); |
base::FilePath launcher_stamp; |
@@ -668,7 +665,9 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, MAYBE_RendererCommandPrefixTest) { |
base::DeleteFile(launcher_script, false); |
base::DeleteFile(launcher_stamp, false); |
} |
- |
+#else |
+#define MAYBE_RendererCommandPrefixTest DISABLED_RendererCommandPrefixTest |
+#endif // defined(OS_POSIX) |
class CrashReporterTest : public HeadlessBrowserTest, |
public HeadlessWebContents::Observer, |
inspector::ExperimentalObserver { |
@@ -678,7 +677,8 @@ class CrashReporterTest : public HeadlessBrowserTest, |
void SetUp() override { |
base::ThreadRestrictions::SetIOAllowed(true); |
- base::CreateNewTempDirectory("CrashReporterTest", &crash_dumps_dir_); |
+ base::CreateNewTempDirectory(FILE_PATH_LITERAL("CrashReporterTest"), |
+ &crash_dumps_dir_); |
EXPECT_FALSE(options()->enable_crash_reporter); |
options()->enable_crash_reporter = true; |
options()->crash_dumps_dir = crash_dumps_dir_; |
@@ -741,7 +741,7 @@ IN_PROC_BROWSER_TEST_F(CrashReporterTest, MAYBE_GenerateMinidump) { |
base::FileEnumerator::FILES); |
base::FilePath minidump = it.Next(); |
EXPECT_FALSE(minidump.empty()); |
- EXPECT_EQ(".dmp", minidump.Extension()); |
+ EXPECT_EQ(FILE_PATH_LITERAL(".dmp"), minidump.Extension()); |
EXPECT_TRUE(it.Next().empty()); |
} |