| Index: headless/lib/headless_browser_browsertest.cc
|
| diff --git a/headless/lib/headless_browser_browsertest.cc b/headless/lib/headless_browser_browsertest.cc
|
| index 824a39da50cc72a7193fc9c61507011f20da916d..9df187e8584ca4afed04957522cbdbc72afde87e 100644
|
| --- a/headless/lib/headless_browser_browsertest.cc
|
| +++ b/headless/lib/headless_browser_browsertest.cc
|
| @@ -396,7 +396,7 @@ namespace {
|
| class ProtocolHandlerWithCookies
|
| : public net::URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| - ProtocolHandlerWithCookies(net::CookieList* sent_cookies);
|
| + explicit ProtocolHandlerWithCookies(net::CookieList* sent_cookies);
|
| ~ProtocolHandlerWithCookies() override {}
|
|
|
| net::URLRequestJob* MaybeCreateJob(
|
| @@ -630,11 +630,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, SetCookiesWithDevTools) {
|
| // TODO(skyostil): This test currently relies on being able to run a shell
|
| // script.
|
| #if defined(OS_POSIX)
|
| -#define MAYBE_RendererCommandPrefixTest RendererCommandPrefixTest
|
| -#else
|
| -#define MAYBE_RendererCommandPrefixTest DISABLED_RendererCommandPrefixTest
|
| -#endif // defined(OS_POSIX)
|
| -IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, MAYBE_RendererCommandPrefixTest) {
|
| +IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, RendererCommandPrefixTest) {
|
| base::ThreadRestrictions::SetIOAllowed(true);
|
| base::FilePath launcher_stamp;
|
| base::CreateTemporaryFile(&launcher_stamp);
|
| @@ -672,6 +668,7 @@ IN_PROC_BROWSER_TEST_F(HeadlessBrowserTest, MAYBE_RendererCommandPrefixTest) {
|
| base::DeleteFile(launcher_script, false);
|
| base::DeleteFile(launcher_stamp, false);
|
| }
|
| +#endif // defined(OS_POSIX)
|
|
|
| class CrashReporterTest : public HeadlessBrowserTest,
|
| public HeadlessWebContents::Observer,
|
| @@ -682,7 +679,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_;
|
| @@ -750,7 +748,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());
|
| }
|
|
|
| @@ -792,8 +790,8 @@ class HeadlessBrowserTestWithNetLog : public HeadlessBrowserTest {
|
| void SetUp() override {
|
| base::ThreadRestrictions::SetIOAllowed(true);
|
| EXPECT_TRUE(base::CreateTemporaryFile(&net_log_));
|
| - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII("--log-net-log",
|
| - net_log_.value());
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
|
| + "--log-net-log", net_log_.MaybeAsASCII());
|
| HeadlessBrowserTest::SetUp();
|
| }
|
|
|
|
|