[headless] Moved headless mode tests into headless namespace.
There are no functional changes.
Change-Id: I8f70868c0fbc6a05382cd3987d8bf08943310285
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4190356
Reviewed-by: Andrey Kosyakov <[email protected]>
Commit-Queue: Peter Kvitek <[email protected]>
Auto-Submit: Peter Kvitek <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1096257}
diff --git a/chrome/browser/headless/headless_mode_browsertest.cc b/chrome/browser/headless/headless_mode_browsertest.cc
index 67c0bca..da19926 100644
--- a/chrome/browser/headless/headless_mode_browsertest.cc
+++ b/chrome/browser/headless/headless_mode_browsertest.cc
@@ -37,6 +37,8 @@
#include "testing/multiprocess_func_list.h"
#include "ui/gfx/switches.h"
+namespace headless {
+
namespace switches {
// This switch runs tests in headful mode, intended for experiments only because
// not all tests are expected to pass in headful mode.
@@ -60,7 +62,8 @@
if (command_line->HasSwitch(switches::kHeadfulMode)) {
headful_mode_ = true;
} else {
- command_line->AppendSwitchASCII(switches::kHeadless, kHeadlessSwitchValue);
+ command_line->AppendSwitchASCII(::switches::kHeadless,
+ kHeadlessSwitchValue);
headless::SetUpCommandLine(command_line);
}
}
@@ -79,10 +82,10 @@
case kStartWindowNormal:
break;
case kStartWindowMaximized:
- command_line->AppendSwitch(switches::kStartMaximized);
+ command_line->AppendSwitch(::switches::kStartMaximized);
break;
case kStartWindowFullscreen:
- command_line->AppendSwitch(switches::kStartFullscreen);
+ command_line->AppendSwitch(::switches::kStartFullscreen);
break;
}
}
@@ -93,6 +96,8 @@
observer.Wait();
}
+namespace {
+
class HeadlessModeBrowserTestWithUserDataDir : public HeadlessModeBrowserTest {
public:
HeadlessModeBrowserTestWithUserDataDir() = default;
@@ -110,7 +115,7 @@
ASSERT_TRUE(user_data_dir_.CreateUniqueTempDir());
ASSERT_TRUE(base::IsDirectoryEmpty(user_data_dir()));
- command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir());
+ command_line->AppendSwitchPath(::switches::kUserDataDir, user_data_dir());
}
const base::FilePath& user_data_dir() const {
@@ -128,7 +133,7 @@
// expected to fail.
base::CommandLine command_line(
base::GetMultiProcessTestChildBaseCommandLine());
- command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir());
+ command_line.AppendSwitchPath(::switches::kUserDataDir, user_data_dir());
base::Process child_process =
base::SpawnMultiProcessTestChild("ChromeProcessSingletonChildProcessMain",
@@ -147,7 +152,7 @@
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
const base::FilePath user_data_dir =
- command_line->GetSwitchValuePath(switches::kUserDataDir);
+ command_line->GetSwitchValuePath(::switches::kUserDataDir);
if (user_data_dir.empty())
return kErrorResultCode;
@@ -158,4 +163,8 @@
return static_cast<int>(notify_result);
}
+} // namespace
+
+} // namespace headless
+
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
