Make callers of CommandLine use it via the base:: namespace.
Covers chrome/browser/* from f on.
BUG=422426
TEST=none
[email protected]
Review URL: https://codereview.chromium.org/816403003
Cr-Commit-Position: refs/heads/master@{#309485}
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc
index 49ae9f8..33481c37 100644
--- a/chrome/browser/fast_shutdown_browsertest.cc
+++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -26,7 +26,7 @@
FastShutdown() {
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kDisablePopupBlocking);
}
diff --git a/chrome/browser/file_select_helper_unittest.cc b/chrome/browser/file_select_helper_unittest.cc
index 9ab79db..c7c128e3 100644
--- a/chrome/browser/file_select_helper_unittest.cc
+++ b/chrome/browser/file_select_helper_unittest.cc
@@ -57,7 +57,7 @@
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
// Unzip the package into a temporary directory.
- CommandLine cl(base::FilePath("/usr/bin/unzip"));
+ base::CommandLine cl(base::FilePath("/usr/bin/unzip"));
cl.AppendArg(dest.value().c_str());
cl.AppendArg("-d");
cl.AppendArg(temp_dir.path().value().c_str());
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 9434c6e8..23543ef 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -591,7 +591,8 @@
bool IsChromeFirstRun() {
if (internal::g_first_run == internal::FIRST_RUN_UNKNOWN) {
internal::g_first_run = internal::FIRST_RUN_FALSE;
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kForceFirstRun) ||
(!command_line->HasSwitch(switches::kNoFirstRun) &&
!internal::IsFirstRunSentinelPresent())) {
@@ -602,7 +603,7 @@
}
#if defined(OS_MACOSX)
-bool IsFirstRunSuppressed(const CommandLine& command_line) {
+bool IsFirstRunSuppressed(const base::CommandLine& command_line) {
return command_line.HasSwitch(switches::kNoFirstRun);
}
#endif
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index b32baa12..ebcf2087 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -101,7 +101,7 @@
InProcessBrowserTest::TearDown();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
InProcessBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kForceFirstRun);
EXPECT_EQ(first_run::AUTO_IMPORT_NONE, first_run::auto_import_state());
@@ -247,7 +247,7 @@
: public FirstRunMasterPrefsBrowserTestT<kWithTrackedPrefs>,
public testing::WithParamInterface<std::string> {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
FirstRunMasterPrefsBrowserTestT::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(
switches::kForceFieldTrials,
diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc
index f66e95a2..d94e5e5 100644
--- a/chrome/browser/first_run/first_run_internal_win.cc
+++ b/chrome/browser/first_run/first_run_internal_win.cc
@@ -47,7 +47,7 @@
exe_dir = exe_dir.Append(installer::kInstallerDir);
base::FilePath exe_path = exe_dir.Append(installer::kSetupExe);
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
cl.AppendSwitchNative(installer::switches::kShowEula, value);
if (base::win::IsMetroProcess()) {
@@ -63,7 +63,7 @@
SEE_MASK_FLAG_LOG_USAGE | SEE_MASK_FLAG_NO_UI);
return false;
} else {
- CommandLine setup_path(exe_path);
+ base::CommandLine setup_path(exe_path);
setup_path.AppendArguments(cl, false);
base::Process process =
diff --git a/chrome/browser/first_run/try_chrome_dialog_view_browsertest.cc b/chrome/browser/first_run/try_chrome_dialog_view_browsertest.cc
index 0bc85eea..17778bf 100644
--- a/chrome/browser/first_run/try_chrome_dialog_view_browsertest.cc
+++ b/chrome/browser/first_run/try_chrome_dialog_view_browsertest.cc
@@ -29,7 +29,7 @@
}
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) {
command_line->AppendSwitchASCII(switches::kTryChromeAgain, "10001");
}
};
diff --git a/chrome/browser/first_run/upgrade_util.cc b/chrome/browser/first_run/upgrade_util.cc
index 7e700aa..7fe942a 100644
--- a/chrome/browser/first_run/upgrade_util.cc
+++ b/chrome/browser/first_run/upgrade_util.cc
@@ -9,13 +9,13 @@
namespace {
-CommandLine* command_line;
+base::CommandLine* command_line;
} // namespace
namespace upgrade_util {
-void SetNewCommandLine(CommandLine* new_command_line) {
+void SetNewCommandLine(base::CommandLine* new_command_line) {
command_line = new_command_line;
}
diff --git a/chrome/browser/first_run/upgrade_util_linux.cc b/chrome/browser/first_run/upgrade_util_linux.cc
index abacf76..25d95974 100644
--- a/chrome/browser/first_run/upgrade_util_linux.cc
+++ b/chrome/browser/first_run/upgrade_util_linux.cc
@@ -21,7 +21,7 @@
namespace upgrade_util {
-bool RelaunchChromeBrowser(const CommandLine& command_line) {
+bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
base::LaunchOptions options;
// Don't set NO_NEW_PRIVS on the relaunched browser process.
options.allow_new_privs = true;
diff --git a/chrome/browser/first_run/upgrade_util_mac.cc b/chrome/browser/first_run/upgrade_util_mac.cc
index 0176fb0..b0ebc98 100644
--- a/chrome/browser/first_run/upgrade_util_mac.cc
+++ b/chrome/browser/first_run/upgrade_util_mac.cc
@@ -7,7 +7,7 @@
namespace upgrade_util {
-bool RelaunchChromeBrowser(const CommandLine& command_line) {
+bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
return mac_relauncher::RelaunchApp(command_line.argv());
}
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index 33ba099..952a7f1 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -117,8 +117,9 @@
// On Windows 7 if the current browser is in Chrome OS mode, then restart
// into Chrome OS mode.
if ((base::win::GetVersion() == base::win::VERSION_WIN7) &&
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect) &&
- !g_browser_process->local_state()->HasPrefPath(prefs::kRelaunchMode)) {
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kViewerConnect) &&
+ !g_browser_process->local_state()->HasPrefPath(prefs::kRelaunchMode)) {
// TODO(ananta)
// On Windows 8, the delegate execute process looks up the previously
// launched mode from the registry and relaunches into that mode. We need
@@ -132,7 +133,7 @@
return RELAUNCH_MODE_DEFAULT;
}
-bool RelaunchChromeHelper(const CommandLine& command_line,
+bool RelaunchChromeHelper(const base::CommandLine& command_line,
const RelaunchMode& relaunch_mode) {
scoped_ptr<base::Environment> env(base::Environment::Create());
std::string version_str;
@@ -151,7 +152,7 @@
// Explicitly make sure to relaunch chrome.exe rather than old_chrome.exe.
// This can happen when old_chrome.exe is launched by a user.
- CommandLine chrome_exe_command_line = command_line;
+ base::CommandLine chrome_exe_command_line = command_line;
chrome_exe_command_line.SetProgram(
chrome_exe.DirName().Append(installer::kChromeExe));
@@ -185,7 +186,7 @@
return false;
}
- CommandLine relaunch_cmd(CommandLine::NO_PROGRAM);
+ base::CommandLine relaunch_cmd(base::CommandLine::NO_PROGRAM);
relaunch_cmd.AppendSwitchPath(switches::kRelaunchShortcut,
ShellIntegration::GetStartMenuShortcut(chrome_exe));
relaunch_cmd.AppendSwitchNative(switches::kWaitForMutex, mutex_name);
@@ -220,11 +221,11 @@
return true;
}
-bool RelaunchChromeBrowser(const CommandLine& command_line) {
+bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
return RelaunchChromeHelper(command_line, RELAUNCH_MODE_DEFAULT);
}
-bool RelaunchChromeWithMode(const CommandLine& command_line,
+bool RelaunchChromeWithMode(const base::CommandLine& command_line,
const RelaunchMode& relaunch_mode) {
return RelaunchChromeHelper(command_line, relaunch_mode);
}
@@ -293,7 +294,7 @@
installer::kChromeOldExe);
}
-bool DoUpgradeTasks(const CommandLine& command_line) {
+bool DoUpgradeTasks(const base::CommandLine& command_line) {
// The DelegateExecute verb handler finalizes pending in-use updates for
// metro mode launches, as Chrome cannot be gracefully relaunched when
// running in this mode.
diff --git a/chrome/browser/fullscreen_mac.mm b/chrome/browser/fullscreen_mac.mm
index 7343dcf1..4dafe8e3 100644
--- a/chrome/browser/fullscreen_mac.mm
+++ b/chrome/browser/fullscreen_mac.mm
@@ -40,7 +40,8 @@
namespace mac {
bool SupportsSystemFullscreen() {
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kDisableSystemFullscreenForTesting))
return false;
diff --git a/chrome/browser/google/chrome_google_url_tracker_client.cc b/chrome/browser/google/chrome_google_url_tracker_client.cc
index d8bc86d..4abbb7e 100644
--- a/chrome/browser/google/chrome_google_url_tracker_client.cc
+++ b/chrome/browser/google/chrome_google_url_tracker_client.cc
@@ -45,7 +45,7 @@
}
bool ChromeGoogleURLTrackerClient::IsBackgroundNetworkingEnabled() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
+ return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableBackgroundNetworking);
}
diff --git a/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc b/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc
index 6ef19ff..3d78022 100644
--- a/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc
+++ b/chrome/browser/guest_view/web_view/context_menu_content_type_web_view.cc
@@ -40,10 +40,10 @@
// Add dev tools for unpacked extensions.
const extensions::Extension* embedder_platform_app = GetExtension();
return !embedder_platform_app ||
- extensions::Manifest::IsUnpackedLocation(
- embedder_platform_app->location()) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDebugPackedApps);
+ extensions::Manifest::IsUnpackedLocation(
+ embedder_platform_app->location()) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDebugPackedApps);
}
#else
return ContextMenuContentType::SupportsGroup(group);
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 90fd7db..05b3d4b 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -60,7 +60,7 @@
class HistoryBrowserTest : public InProcessBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kEnableFileCookies);
}
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index 98544a9..175022b 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -53,7 +53,8 @@
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
index 2628f86b..ead73336 100644
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -66,7 +66,7 @@
STLDeleteElements(&fetchers_);
resulting_origins_.clear();
- const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
return;
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
index 1745e2e9..161d37c 100644
--- a/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
+++ b/chrome/browser/invalidation/profile_invalidation_provider_factory_browsertest.cc
@@ -52,7 +52,7 @@
ProfileInvalidationProviderFactoryLoginScreenBrowserTest();
virtual ~ProfileInvalidationProviderFactoryLoginScreenBrowserTest();
- virtual void SetUpCommandLine(CommandLine* command_line) override;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override;
private:
DISALLOW_COPY_AND_ASSIGN(
@@ -68,7 +68,7 @@
}
void ProfileInvalidationProviderFactoryLoginScreenBrowserTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
command_line->AppendSwitch(chromeos::switches::kLoginManager);
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
}
@@ -88,7 +88,7 @@
ProfileInvalidationProviderFactoryGuestBrowserTest();
virtual ~ProfileInvalidationProviderFactoryGuestBrowserTest();
- virtual void SetUpCommandLine(CommandLine* command_line) override;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override;
private:
DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactoryGuestBrowserTest);
@@ -103,7 +103,7 @@
}
void ProfileInvalidationProviderFactoryGuestBrowserTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
command_line->AppendSwitch(chromeos::switches::kGuestSession);
command_line->AppendSwitch(::switches::kIncognito);
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider.cc b/chrome/browser/invalidation/ticl_profile_settings_provider.cc
index 978f4188..b0160122 100644
--- a/chrome/browser/invalidation/ticl_profile_settings_provider.cc
+++ b/chrome/browser/invalidation/ticl_profile_settings_provider.cc
@@ -43,7 +43,7 @@
return true;
}
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kInvalidationUseGCMChannel)) {
// Use GCM channel if it was enabled via a command-line switch.
return true;
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index aaf9faa..3fe1e88 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -170,7 +170,8 @@
scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
TRACE_EVENT0("startup", "IOThread::CreateGlobalHostResolver");
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
net::HostResolver::Options options;
@@ -293,7 +294,7 @@
return context;
}
-int GetSwitchValueAsInt(const CommandLine& command_line,
+int GetSwitchValueAsInt(const base::CommandLine& command_line,
const std::string& switch_name) {
int value;
if (!base::StringToInt(command_line.GetSwitchValueASCII(switch_name),
@@ -577,7 +578,8 @@
net::SetMessageLoopForNSSHttpIO();
#endif
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
DCHECK(!globals_);
globals_ = new Globals;
@@ -808,7 +810,7 @@
base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks();
}
-void IOThread::InitializeNetworkOptions(const CommandLine& command_line) {
+void IOThread::InitializeNetworkOptions(const base::CommandLine& command_line) {
// Only handle use-spdy command line flags if "spdy.disabled" preference is
// not disabled via policy.
if (is_spdy_disabled_by_policy_) {
@@ -848,7 +850,7 @@
// HttpNetworkSession::Params.
}
-void IOThread::ConfigureTCPFastOpen(const CommandLine& command_line) {
+void IOThread::ConfigureTCPFastOpen(const base::CommandLine& command_line) {
const std::string trial_group =
base::FieldTrialList::FindFullName(kTCPFastOpenFieldTrialName);
if (trial_group == kTCPFastOpenHttpsEnabledGroupName)
@@ -1118,7 +1120,8 @@
DCHECK(!globals_->system_proxy_service.get());
DCHECK(system_proxy_config_service_.get());
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
globals_->system_proxy_service.reset(
ProxyServiceFactory::CreateProxyService(
net_log_,
@@ -1151,7 +1154,7 @@
globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_);
}
-void IOThread::ConfigureQuic(const CommandLine& command_line) {
+void IOThread::ConfigureQuic(const base::CommandLine& command_line) {
// Always fetch the field trial group to ensure it is reported correctly.
// The command line flags will be associated with a group that is reported
// so long as trial is actually queried.
@@ -1264,7 +1267,7 @@
}
}
-bool IOThread::ShouldEnableQuic(const CommandLine& command_line,
+bool IOThread::ShouldEnableQuic(const base::CommandLine& command_line,
base::StringPiece quic_trial_group) {
if (command_line.HasSwitch(switches::kDisableQuic))
return false;
@@ -1277,7 +1280,7 @@
}
bool IOThread::ShouldEnableQuicPortSelection(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kDisableQuicPortSelection))
return false;
@@ -1288,7 +1291,7 @@
}
bool IOThread::ShouldEnableQuicPacing(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
base::StringPiece quic_trial_group,
const VariationParameters& quic_trial_params) {
if (command_line.HasSwitch(switches::kEnableQuicPacing))
@@ -1303,7 +1306,7 @@
}
net::QuicTagVector IOThread::GetQuicConnectionOptions(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const VariationParameters& quic_trial_params) {
if (command_line.HasSwitch(switches::kQuicConnectionOptions)) {
return net::QuicUtils::ParseQuicConnectionOptions(
@@ -1388,7 +1391,7 @@
// static
size_t IOThread::GetQuicMaxPacketLength(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
base::StringPiece quic_trial_group,
const VariationParameters& quic_trial_params) {
if (command_line.HasSwitch(switches::kQuicMaxPacketLength)) {
@@ -1412,7 +1415,7 @@
// static
net::QuicVersion IOThread::GetQuicVersion(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const VariationParameters& quic_trial_params) {
if (command_line.HasSwitch(switches::kQuicVersion)) {
return ParseQuicVersion(
diff --git a/chrome/browser/jumplist_updater_win.cc b/chrome/browser/jumplist_updater_win.cc
index 25e5ebf..7230449 100644
--- a/chrome/browser/jumplist_updater_win.cc
+++ b/chrome/browser/jumplist_updater_win.cc
@@ -82,8 +82,7 @@
// ShellLinkItem
ShellLinkItem::ShellLinkItem()
- : command_line_(CommandLine::NO_PROGRAM),
- icon_index_(0) {
+ : command_line_(base::CommandLine::NO_PROGRAM), icon_index_(0) {
}
ShellLinkItem::~ShellLinkItem() {}
@@ -92,7 +91,7 @@
return command_line_.GetArgumentsString();
}
-CommandLine* ShellLinkItem::GetCommandLine() {
+base::CommandLine* ShellLinkItem::GetCommandLine() {
return &command_line_;
}
@@ -112,7 +111,8 @@
// JumpList is implemented only on Windows 7 or later.
// Do not create custom JumpLists in tests. See http://crbug.com/389375.
return base::win::GetVersion() >= base::win::VERSION_WIN7 &&
- !CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType);
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kTestType);
}
bool JumpListUpdater::BeginUpdate() {
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 1eb72f59..eeb5f8a5 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -52,7 +52,8 @@
// Append the common switches to each shell link.
void AppendCommonSwitches(ShellLinkItem* shell_link) {
const char* kSwitchNames[] = { switches::kUserDataDir };
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
shell_link->GetCommandLine()->CopySwitchesFrom(command_line,
kSwitchNames,
arraysize(kSwitchNames));
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index ad0a78e3..6e8e80b 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -177,7 +177,8 @@
}
void StartShutdownTracing() {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kTraceShutdown)) {
base::debug::CategoryFilter category_filter(
command_line.GetSwitchValueASCII(switches::kTraceShutdown));
diff --git a/chrome/browser/lifetime/application_lifetime_aura.cc b/chrome/browser/lifetime/application_lifetime_aura.cc
index 06bd54275..75d67ba 100644
--- a/chrome/browser/lifetime/application_lifetime_aura.cc
+++ b/chrome/browser/lifetime/application_lifetime_aura.cc
@@ -32,8 +32,8 @@
views::Widget::CloseAllSecondaryWidgets();
#if defined(OS_CHROMEOS)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableZeroBrowsersOpenForTests)) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableZeroBrowsersOpenForTests)) {
// App is exiting, call DecrementKeepAliveCount() on behalf of Aura Shell.
DecrementKeepAliveCount();
// Make sure we have notified the session manager that we are exiting.
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 4cb1584..a9bfd3ca 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -179,7 +179,7 @@
public:
FakeBackgroundModeManager()
: BackgroundModeManager(
- CommandLine::ForCurrentProcess(),
+ base::CommandLine::ForCurrentProcess(),
&g_browser_process->profile_manager()->GetProfileInfoCache()),
suspended_(false) {}
@@ -220,7 +220,7 @@
base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
if (GetParam())
command_line->AppendSwitch(switches::kEnableFastUnload);
#if defined(OS_CHROMEOS)
diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.cc b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.cc
index b5e43d8..0bfa23a8 100644
--- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.cc
@@ -62,7 +62,8 @@
request_context_(request_context) {
net::AddressFamily address_family = net::ADDRESS_FAMILY_UNSPECIFIED;
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kPrivetIPv6Only)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kPrivetIPv6Only)) {
address_family = net::ADDRESS_FAMILY_IPV6;
}
diff --git a/chrome/browser/local_discovery/privet_notifications.cc b/chrome/browser/local_discovery/privet_notifications.cc
index e4ea7b1..7824b4e9 100644
--- a/chrome/browser/local_discovery/privet_notifications.cc
+++ b/chrome/browser/local_discovery/privet_notifications.cc
@@ -224,14 +224,14 @@
// static
bool PrivetNotificationService::IsEnabled() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return !command_line->HasSwitch(
switches::kDisableDeviceDiscoveryNotifications);
}
// static
bool PrivetNotificationService::IsForced() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return command_line->HasSwitch(switches::kEnableDeviceDiscoveryNotifications);
}
diff --git a/chrome/browser/locale_tests_browsertest.cc b/chrome/browser/locale_tests_browsertest.cc
index ba2f26e..6c57279 100644
--- a/chrome/browser/locale_tests_browsertest.cc
+++ b/chrome/browser/locale_tests_browsertest.cc
@@ -69,7 +69,7 @@
explicit LocaleTestBase(const char* locale) : locale_(locale) {
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kLang, locale_.locale());
}
diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index 2f7e81c..15c31753 100644
--- a/chrome/browser/mac/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -365,7 +365,7 @@
helper_path = helper_path.Append(chrome::kHelperProcessExecutablePath);
std::vector<std::string> args =
- CommandLine::ForCurrentProcess()->argv();
+ base::CommandLine::ForCurrentProcess()->argv();
args[0] = browser_path.value();
std::vector<std::string> relauncher_args;
diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
index ec435fb..d06a595e 100644
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
@@ -36,7 +36,7 @@
~MediaStreamInfoBarTest() override {}
// InProcessBrowserTest:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// This test expects to run with fake devices but real UI.
command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream))
@@ -128,7 +128,8 @@
TestAcceptThenDenyWhichShouldBeSticky) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
index 0e2a679..350f525 100644
--- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
@@ -51,12 +51,12 @@
public:
WebRtcApprtcBrowserTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
// The video playback will not work without a GPU, so force its use here.
command_line->AppendSwitch(switches::kUseGpuInTests);
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeDeviceForMediaStream);
}
@@ -92,7 +92,7 @@
return false;
}
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
EXPECT_TRUE(GetPythonCommand(&command_line));
command_line.AppendArgPath(appengine_dev_appserver);
@@ -124,7 +124,7 @@
return false;
}
- CommandLine command_line(collider_server);
+ base::CommandLine command_line(collider_server);
command_line.AppendArg("-tls=false");
command_line.AppendArg("-port=" + collider_port);
@@ -219,7 +219,7 @@
return false;
}
- CommandLine command_line(firefox_launcher);
+ base::CommandLine command_line(firefox_launcher);
command_line.AppendSwitchPath("--binary", firefox_binary);
command_line.AppendSwitchASCII("--webpage", url.spec());
diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
index bfb8cfb..263b61a 100644
--- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
@@ -128,7 +128,7 @@
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EXPECT_FALSE(command_line->HasSwitch(
switches::kUseFakeUIForMediaStream));
@@ -139,7 +139,7 @@
}
void ConfigureFakeDeviceToPlayFile(const base::FilePath& wav_file_path) {
- CommandLine::ForCurrentProcess()->AppendSwitchPath(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchPath(
switches::kUseFileForFakeAudioCapture, wav_file_path);
}
@@ -192,7 +192,7 @@
EXPECT_FALSE(recording_application_.IsValid())
<< "Tried to record, but is already recording.";
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
#if defined(OS_WIN)
// This disable is required to run SoundRecorder.exe on 64-bit Windows
// from a 32-bit binary. We need to load the wow64 disable function from
@@ -273,7 +273,7 @@
bool ForceMicrophoneVolumeTo100Percent() {
#if defined(OS_WIN)
// Note: the force binary isn't in tools since it's one of our own.
- CommandLine command_line(test::GetReferenceFilesDir().Append(
+ base::CommandLine command_line(test::GetReferenceFilesDir().Append(
FILE_PATH_LITERAL("force_mic_volume_max.exe")));
DVLOG(0) << "Running " << command_line.GetCommandLineString();
std::string result;
@@ -282,7 +282,8 @@
return false;
}
#elif defined(OS_MACOSX)
- CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("osascript")));
+ base::CommandLine command_line(
+ base::FilePath(FILE_PATH_LITERAL("osascript")));
command_line.AppendArg("-e");
command_line.AppendArg("set volume input volume 100");
command_line.AppendArg("-e");
@@ -300,7 +301,7 @@
for (int device_index = 0; device_index < 5; ++device_index) {
std::string result;
const std::string kHundredPercentVolume = "65536";
- CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("pacmd")));
+ base::CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("pacmd")));
command_line.AppendArg("set-source-volume");
command_line.AppendArg(base::StringPrintf("%d", device_index));
command_line.AppendArg(kHundredPercentVolume);
@@ -316,18 +317,18 @@
// Sox is the "Swiss army knife" of audio processing. We mainly use it for
// silence trimming. See http://sox.sourceforge.net.
-CommandLine MakeSoxCommandLine() {
+base::CommandLine MakeSoxCommandLine() {
#if defined(OS_WIN)
base::FilePath sox_path = test::GetReferenceFilesDir().Append(
FILE_PATH_LITERAL("tools/sox.exe"));
if (!base::PathExists(sox_path)) {
LOG(ERROR) << "Missing sox.exe binary in " << sox_path.value()
<< "; you may have to provide this binary yourself.";
- return CommandLine(CommandLine::NO_PROGRAM);
+ return base::CommandLine(base::CommandLine::NO_PROGRAM);
}
- CommandLine command_line(sox_path);
+ base::CommandLine command_line(sox_path);
#else
- CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("sox")));
+ base::CommandLine command_line(base::FilePath(FILE_PATH_LITERAL("sox")));
#endif
return command_line;
}
@@ -350,7 +351,7 @@
const char* kDuration = "2";
const char* kTreshold = "3%";
- CommandLine command_line = MakeSoxCommandLine();
+ base::CommandLine command_line = MakeSoxCommandLine();
if (command_line.GetProgram().empty())
return false;
command_line.AppendArgPath(input_file);
@@ -380,7 +381,7 @@
// speech segments must be at least 500 ms for this to be reliable.
bool SplitFileOnSilence(const base::FilePath& input_file,
const base::FilePath& output_file_template) {
- CommandLine command_line = MakeSoxCommandLine();
+ base::CommandLine command_line = MakeSoxCommandLine();
if (command_line.GetProgram().empty())
return false;
@@ -449,7 +450,7 @@
return false;
}
- CommandLine command_line(pesq_path);
+ base::CommandLine command_line(pesq_path);
command_line.AppendArg(base::StringPrintf("+%d", sample_rate));
command_line.AppendArgPath(reference_file);
command_line.AppendArgPath(actual_file);
diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc
index c28d60c..1877260 100644
--- a/chrome/browser/media/chrome_webrtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_browsertest.cc
@@ -28,7 +28,7 @@
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Ensure the infobar is enabled, since we expect that in this test.
EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
index c950ed5..91d613a 100644
--- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
@@ -35,7 +35,7 @@
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// This test should run with fake devices.
command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc
index bca404e..b68e1c3 100644
--- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc
@@ -47,7 +47,7 @@
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Ensure the infobar is enabled, since we expect that in this test.
EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
diff --git a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc
index c7ff10ad..b48c9e95 100644
--- a/chrome/browser/media/chrome_webrtc_perf_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_perf_browsertest.cc
@@ -37,7 +37,7 @@
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Ensure the infobar is enabled, since we expect that in this test.
EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
index 83205022..7d1347e 100644
--- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
@@ -107,7 +107,7 @@
ASSERT_TRUE(temp_working_dir_.CreateUniqueTempDir());
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Set up the command line option with the expected file name. We will check
// its existence in HasAllRequiredResources().
webrtc_reference_video_y4m_ = test::GetReferenceFilesDir()
@@ -166,7 +166,7 @@
return false;
}
- CommandLine converter_command(path_to_converter);
+ base::CommandLine converter_command(path_to_converter);
converter_command.AppendSwitchPath("--frames_dir", GetWorkingDir());
converter_command.AppendSwitchPath("--output_file",
captured_video_filename);
@@ -219,7 +219,7 @@
// Note: don't append switches to this command since it will mess up the
// -u in the python invocation!
- CommandLine compare_command(CommandLine::NO_PROGRAM);
+ base::CommandLine compare_command(base::CommandLine::NO_PROGRAM);
EXPECT_TRUE(GetPythonCommand(&compare_command));
compare_command.AppendArgPath(path_to_compare_script);
diff --git a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
index 4eb0574..5f4a3ea 100644
--- a/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_webcam_browsertest.cc
@@ -39,7 +39,7 @@
class WebRtcWebcamBrowserTest : public WebRtcTestBase,
public testing::WithParamInterface<const char*> {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EXPECT_FALSE(command_line->HasSwitch(
switches::kUseFakeDeviceForMediaStream));
EXPECT_FALSE(command_line->HasSwitch(
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index e119636..2000b687 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -237,7 +237,7 @@
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError));
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
#if defined(OS_ANDROID)
command_line->AppendSwitch(
switches::kDisableGestureRequirementForMediaPlayback);
@@ -245,7 +245,7 @@
}
void SetUpCommandLineForKeySystem(const std::string& key_system,
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
if (GetServerConfig(key_system))
// Since the web and license servers listen on different ports, we need to
// disable web-security to send license requests to the license server.
@@ -266,7 +266,7 @@
private:
#if defined(ENABLE_PEPPER_CDMS)
- void RegisterPepperCdm(CommandLine* command_line,
+ void RegisterPepperCdm(base::CommandLine* command_line,
const std::string& adapter_name,
const std::string& key_system) {
DCHECK(!is_pepper_cdm_registered_)
@@ -329,7 +329,7 @@
}
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EncryptedMediaTestBase::SetUpCommandLine(command_line);
SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
}
@@ -341,7 +341,7 @@
// enabled by default.
class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EncryptedMediaTestBase::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableEncryptedMedia);
SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
@@ -352,7 +352,7 @@
// Tests encrypted media playback using Widevine key system.
class WVEncryptedMediaTest : public EncryptedMediaTestBase {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
EncryptedMediaTestBase::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableEncryptedMedia);
SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line);
@@ -434,7 +434,7 @@
}
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
EncryptedMediaTestBase::SetUpCommandLine(command_line);
SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line);
diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
index 5e46ac9..a19bfc0 100644
--- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
@@ -196,7 +196,7 @@
// Update the command line to load |adapter_name| for
// |pepper_type_for_key_system|.
- void RegisterPepperCdm(CommandLine* command_line,
+ void RegisterPepperCdm(base::CommandLine* command_line,
const std::string& adapter_name,
const std::string& pepper_type_for_key_system,
bool expect_adapter_exists = true) {
@@ -326,7 +326,7 @@
: public EncryptedMediaIsTypeSupportedTest {
#if defined(ENABLE_PEPPER_CDMS)
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Platform-specific filename relative to the chrome executable.
const char adapter_file_name[] =
#if defined(OS_MACOSX)
@@ -355,7 +355,7 @@
class EncryptedMediaIsTypeSupportedClearKeyCDMRegisteredWithWrongPathTest
: public EncryptedMediaIsTypeSupportedTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
RegisterPepperCdm(command_line,
"clearkeycdmadapterwrongname.dll",
"application/x-ppapi-clearkey-cdm",
@@ -367,7 +367,7 @@
class EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest
: public EncryptedMediaIsTypeSupportedTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
RegisterPepperCdm(command_line,
"widevinecdmadapterwrongname.dll",
"application/x-ppapi-widevine-cdm",
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index f1877938..1daa001 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -262,8 +262,9 @@
#if defined(OS_MACOSX)
// AVFoundation is used for video/audio device monitoring and video capture.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceQTKit)) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kForceQTKit)) {
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableAVFoundation);
}
#endif
@@ -573,7 +574,7 @@
const bool origin_is_secure =
request.security_origin.SchemeIsSecure() ||
request.security_origin.SchemeIs(extensions::kExtensionScheme) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAllowHttpScreenCapture);
// If basic conditions (screen capturing is enabled and origin is secure)
diff --git a/chrome/browser/media/test_license_server.cc b/chrome/browser/media/test_license_server.cc
index 8efc779..e4c3fb6 100644
--- a/chrome/browser/media/test_license_server.cc
+++ b/chrome/browser/media/test_license_server.cc
@@ -29,7 +29,7 @@
return false;
}
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
if (!server_config_->GetServerCommandLine(&command_line)) {
DVLOG(0) << "Could not get server command line to launch.";
return false;
diff --git a/chrome/browser/media/wv_test_license_server_config.cc b/chrome/browser/media/wv_test_license_server_config.cc
index c789c474..e9db611 100644
--- a/chrome/browser/media/wv_test_license_server_config.cc
+++ b/chrome/browser/media/wv_test_license_server_config.cc
@@ -37,7 +37,7 @@
}
bool WVTestLicenseServerConfig::GetServerCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
if (!GetPythonCommand(command_line)) {
LOG(ERROR) << "Could not get Python runtime command.";
return false;
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
index 8d7142b..5b21876 100644
--- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -432,7 +432,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
std::vector<std::string> all_permissions;
all_permissions.push_back("allAutoDetected");
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
index bdc44e9..3bdbfac 100644
--- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
@@ -61,7 +61,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
base::RunLoop loop;
diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
index f9ee687..3c8775e6 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
@@ -120,7 +120,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
ReinitPrefsAndExpectations();
diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc
index 05b380d..1fea8f0 100644
--- a/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc
+++ b/chrome/browser/media_galleries/media_galleries_scan_result_controller_unittest.cc
@@ -52,7 +52,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
base::RunLoop loop;
diff --git a/chrome/browser/media_galleries/media_scan_manager_unittest.cc b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
index 7335b1e..d2bb73f 100644
--- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc
+++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
@@ -106,7 +106,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
gallery_prefs_ =
MediaGalleriesPreferencesFactory::GetForProfile(profile_.get());
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
index 3151354..2307e63 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -99,7 +99,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile())));
extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
std::vector<std::string> all_permissions;
all_permissions.push_back("allAutoDetected");
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 3d5e9e7..8c85e6e 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -196,7 +196,8 @@
#endif
void RecordTouchEventState() {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
const std::string touch_enabled_switch =
command_line.HasSwitch(switches::kTouchEvents) ?
command_line.GetSwitchValueASCII(switches::kTouchEvents) :
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index 4673d50..ef588c1 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -450,7 +450,7 @@
void ChromeMetricsServiceClient::RecordCommandLineMetrics() {
// Get stats on use of command line.
- const CommandLine* command_line(CommandLine::ForCurrentProcess());
+ const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess());
size_t common_commands = 0;
if (command_line->HasSwitch(switches::kUserDataDir)) {
++common_commands;
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc
index e92f41b1..4243b08 100644
--- a/chrome/browser/metrics/metrics_service_browsertest.cc
+++ b/chrome/browser/metrics/metrics_service_browsertest.cc
@@ -29,7 +29,7 @@
class MetricsServiceBrowserTest : public InProcessBrowserTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Enable the metrics service for testing (in recording-only mode).
command_line->AppendSwitch(switches::kMetricsRecordingOnly);
}
diff --git a/chrome/browser/metrics/metrics_services_manager.cc b/chrome/browser/metrics/metrics_services_manager.cc
index 8465c0f8..c67f023 100644
--- a/chrome/browser/metrics/metrics_services_manager.cc
+++ b/chrome/browser/metrics/metrics_services_manager.cc
@@ -89,7 +89,8 @@
// If the user permits metrics reporting with the checkbox in the
// prefs, we turn on recording. We disable metrics completely for
// non-official builds, or when field trials are forced.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceFieldTrials))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kForceFieldTrials))
return false;
bool enabled = false;
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index 1bdd544..7084672 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -345,7 +345,8 @@
}
// static
-void ThreadWatcherList::StartWatchingAll(const CommandLine& command_line) {
+void ThreadWatcherList::StartWatchingAll(
+ const base::CommandLine& command_line) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
uint32 unresponsive_threshold;
CrashOnHangThreadMap crash_on_hang_threads;
@@ -441,7 +442,7 @@
// static
void ThreadWatcherList::ParseCommandLine(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
uint32* unresponsive_threshold,
CrashOnHangThreadMap* crash_on_hang_threads) {
// Initialize |unresponsive_threshold| to a default value.
diff --git a/chrome/browser/metrics/thread_watcher_android.cc b/chrome/browser/metrics/thread_watcher_android.cc
index e4f8086..74aab6a 100644
--- a/chrome/browser/metrics/thread_watcher_android.cc
+++ b/chrome/browser/metrics/thread_watcher_android.cc
@@ -33,7 +33,8 @@
base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES &&
g_application_has_stopped) {
g_application_has_stopped = false;
- ThreadWatcherList::StartWatchingAll(*CommandLine::ForCurrentProcess());
+ ThreadWatcherList::StartWatchingAll(
+ *base::CommandLine::ForCurrentProcess());
}
}
diff --git a/chrome/browser/metrics/thread_watcher_android_unittest.cc b/chrome/browser/metrics/thread_watcher_android_unittest.cc
index 0ded05a1..ee04c5dc 100644
--- a/chrome/browser/metrics/thread_watcher_android_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_android_unittest.cc
@@ -55,7 +55,7 @@
// Register, and notify the application has just started,
// and ensure the thread watcher list is created.
ThreadWatcherAndroid::RegisterApplicationStatusListener();
- ThreadWatcherList::StartWatchingAll(*CommandLine::ForCurrentProcess());
+ ThreadWatcherList::StartWatchingAll(*base::CommandLine::ForCurrentProcess());
NotifyApplicationStateChange(
base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES);
EXPECT_TRUE(ThreadWatcherList::g_thread_watcher_list_);
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index 2f360be..a53cd49 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -337,7 +337,7 @@
TEST_F(ThreadWatcherTest, ThreadNamesOnlyArgs) {
// Setup command_line arguments.
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kCrashOnHangThreads,
crash_on_hang_thread_names);
@@ -367,7 +367,7 @@
TEST_F(ThreadWatcherTest, ThreadNamesAndLiveThresholdArgs) {
// Setup command_line arguments.
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kCrashOnHangThreads,
thread_names_and_live_threshold);
@@ -397,7 +397,7 @@
TEST_F(ThreadWatcherTest, CrashOnHangThreadsAllArgs) {
// Setup command_line arguments.
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kCrashOnHangThreads,
crash_on_hang_thread_data);
@@ -697,7 +697,7 @@
// whilst StopWatchingAll() will just PostTask to destroy it.
// Ensure that when Stop is called, Start will NOT create
// g_thread_watcher_list_ later on.
- ThreadWatcherList::StartWatchingAll(*CommandLine::ForCurrentProcess());
+ ThreadWatcherList::StartWatchingAll(*base::CommandLine::ForCurrentProcess());
ThreadWatcherList::StopWatchingAll();
message_loop_for_ui.PostDelayedTask(
FROM_HERE,
@@ -711,7 +711,7 @@
"Start / Stopped");
// Proceed with just |StartWatchingAll| and ensure it'll be started.
- ThreadWatcherList::StartWatchingAll(*CommandLine::ForCurrentProcess());
+ ThreadWatcherList::StartWatchingAll(*base::CommandLine::ForCurrentProcess());
message_loop_for_ui.PostDelayedTask(
FROM_HERE,
message_loop_for_ui.QuitClosure(),
diff --git a/chrome/browser/metrics/variations/variations_service.cc b/chrome/browser/metrics/variations/variations_service.cc
index 93ddf6b..56df926 100644
--- a/chrome/browser/metrics/variations/variations_service.cc
+++ b/chrome/browser/metrics/variations/variations_service.cc
@@ -80,7 +80,7 @@
break;
}
const std::string forced_channel =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kFakeVariationsChannel);
if (forced_channel == "stable")
return variations::Study_Channel_STABLE;
@@ -373,8 +373,9 @@
// static
GURL VariationsService::GetVariationsServerURL(
PrefService* policy_pref_service) {
- std::string server_url_string(CommandLine::ForCurrentProcess()->
- GetSwitchValueASCII(switches::kVariationsServerURL));
+ std::string server_url_string(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kVariationsServerURL));
if (server_url_string.empty())
server_url_string = kDefaultVariationsServerURL;
GURL server_url = GURL(server_url_string);
@@ -428,7 +429,7 @@
#if !defined(GOOGLE_CHROME_BUILD)
// Unless the URL was provided, unsupported builds should return NULL to
// indicate that the service should not be used.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kVariationsServerURL)) {
DVLOG(1) << "Not creating VariationsService in unofficial build without --"
<< switches::kVariationsServerURL << " specified.";
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
index 8204bb2..c3db3660 100644
--- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
+++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -19,7 +19,7 @@
NaClGdbDebugStubTest() {
}
- void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
void StartTestScript(base::ProcessHandle* test_process,
std::string test_name, int debug_stub_port);
@@ -27,7 +27,7 @@
const std::string& test_name);
};
-void NaClGdbDebugStubTest::SetUpCommandLine(CommandLine* command_line) {
+void NaClGdbDebugStubTest::SetUpCommandLine(base::CommandLine* command_line) {
PPAPINaClNewlibTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableNaClDebug);
}
@@ -36,7 +36,7 @@
std::string test_name,
int debug_stub_port) {
// We call python script to reuse GDB RSP protocol implementation.
- CommandLine cmd(base::FilePath(FILE_PATH_LITERAL("python")));
+ base::CommandLine cmd(base::FilePath(FILE_PATH_LITERAL("python")));
base::FilePath script;
PathService::Get(chrome::DIR_TEST_DATA, &script);
script = script.AppendASCII("nacl/debug_stub_browser_tests.py");
diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
index 25bbb3b..b7d7f4c 100644
--- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
+++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
@@ -23,7 +23,7 @@
NaClGdbTest() {
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
PPAPINaClNewlibTest::SetUpCommandLine(command_line);
base::FilePath mock_nacl_gdb;
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc
index a9d3687..7b9fabd5 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/chrome/browser/net/chrome_net_log.cc
@@ -20,7 +20,8 @@
ChromeNetLog::ChromeNetLog()
: net_log_temp_file_(new NetLogTempFile(this)) {
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kLogNetLog)) {
base::FilePath log_path =
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
index 563a4be..0d08a7c6 100644
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -536,7 +536,7 @@
// If we're running Chrome for ChromeOS on Linux, we want to allow file
// access.
if (!base::SysInfo::IsRunningOnChromeOS() ||
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+ base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
return true;
}
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index ae905e0..58def716 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -185,8 +185,8 @@
ConnectionTester::ProxySettingsExperiment experiment,
scoped_ptr<net::ProxyConfigService>* proxy_config_service,
scoped_ptr<net::ProxyService>* experiment_proxy_service) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSingleProcess)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess)) {
// We can't create a standard proxy resolver in single-process mode.
// Rather than falling-back to some other implementation, fail.
return net::ERR_NOT_IMPLEMENTED;
diff --git a/chrome/browser/net/cookie_store_util.cc b/chrome/browser/net/cookie_store_util.cc
index 7bd65a0d..947842da 100644
--- a/chrome/browser/net/cookie_store_util.cc
+++ b/chrome/browser/net/cookie_store_util.cc
@@ -100,7 +100,8 @@
namespace chrome_browser_net {
bool IsCookieRecordMode() {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
// Only allow Record Mode if we are in a Debug build or where we are running
// a cycle, and the user has limited control.
return command_line.HasSwitch(switches::kRecordMode) &&
@@ -108,7 +109,8 @@
}
bool ShouldUseInMemoryCookiesAndCache() {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
return IsCookieRecordMode() ||
command_line.HasSwitch(switches::kPlaybackMode);
}
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
index 1cc1be68..63445b8 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc
@@ -326,7 +326,7 @@
testing::TestWithParam<CommandLineTestParams> > {
protected:
PrefProxyConfigTrackerImplCommandLineTest()
- : command_line_(CommandLine::NO_PROGRAM) {}
+ : command_line_(base::CommandLine::NO_PROGRAM) {}
void SetUp() override {
for (size_t i = 0; i < arraysize(GetParam().switches); i++) {
@@ -345,7 +345,7 @@
}
private:
- CommandLine command_line_;
+ base::CommandLine command_line_;
scoped_ptr<PrefService> pref_service_;
};
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc
index c20cb35..9f233b1 100644
--- a/chrome/browser/net/proxy_browsertest.cc
+++ b/chrome/browser/net/proxy_browsertest.cc
@@ -85,7 +85,7 @@
InProcessBrowserTest::SetUp();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kProxyServer,
proxy_server_.host_port_pair().ToString());
}
@@ -155,7 +155,7 @@
InProcessBrowserTest::SetUp();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
base::FilePath pac_script_path(FILE_PATH_LITERAL("files"));
command_line->AppendSwitchASCII(switches::kProxyPacUrl, http_server_.GetURL(
pac_script_path.Append(kPACScript).MaybeAsASCII()).spec());
@@ -177,7 +177,7 @@
FileProxyScriptBrowserTest() {}
~FileProxyScriptBrowserTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kProxyPacUrl,
ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory),
@@ -207,7 +207,7 @@
InProcessBrowserTest::SetUp();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
base::FilePath pac_script_path(kPACScript);
command_line->AppendSwitchASCII(
switches::kProxyPacUrl,
@@ -230,7 +230,7 @@
DataProxyScriptBrowserTest() {}
~DataProxyScriptBrowserTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
std::string contents;
// Read in kPACScript contents.
ASSERT_TRUE(base::ReadFileToString(ui_test_utils::GetTestFilePath(
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 93a41a9d..c73f3c72 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -90,7 +90,7 @@
net::URLRequestContext* context,
net::NetworkDelegate* network_delegate,
net::ProxyConfigService* proxy_config_service,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
bool quick_check_enabled) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
index 8b52db2..d60ba1d4 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc
@@ -162,7 +162,7 @@
TEST_F(DataReductionProxySettingsAndroidTest,
TestGetDataReductionProxyDevOrigin) {
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
data_reduction_proxy::switches::kDataReductionProxyDev,
kDataReductionProxyDev);
ResetSettings(true, true, false, true, false);
diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
index f0a413c..770542e 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc
@@ -172,7 +172,7 @@
TEST_F(SSLConfigServiceManagerPrefTest, CommandLinePrefs) {
scoped_refptr<TestingPrefStore> local_state_store(new TestingPrefStore());
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kSSLVersionMin, "tls1");
command_line.AppendSwitchASCII(switches::kSSLVersionMax, "ssl3");
diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc
index cb97e5a..fed6d18 100644
--- a/chrome/browser/notifications/message_center_notifications_browsertest.cc
+++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc
@@ -149,7 +149,8 @@
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, BasicAddCancel) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -167,7 +168,8 @@
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, BasicDelegate) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -184,7 +186,8 @@
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, ButtonClickedDelegate) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -202,7 +205,8 @@
UpdateExistingNotification) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -222,7 +226,8 @@
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, QueueWhenCenterVisible) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -259,7 +264,8 @@
UpdateNonProgressNotificationWhenCenterVisible) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -294,7 +300,8 @@
UpdateNonProgressToProgressNotificationWhenCenterVisible) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -328,7 +335,8 @@
UpdateProgressNotificationWhenCenterVisible) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index 0bcc7aa6f..f5604c4 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -104,8 +104,8 @@
}
bool ChromePasswordManagerClient::IsAutomaticPasswordSavingEnabled() const {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- password_manager::switches::kEnableAutomaticPasswordSaving) &&
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ password_manager::switches::kEnableAutomaticPasswordSaving) &&
chrome::VersionInfo::GetChannel() ==
chrome::VersionInfo::CHANNEL_UNKNOWN;
}
@@ -505,7 +505,7 @@
#if !defined(USE_AURA) && !defined(OS_MACOSX)
return false;
#endif
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kDisableSavePasswordBubble))
return false;
@@ -520,7 +520,7 @@
}
bool ChromePasswordManagerClient::EnabledForSyncSignin() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(
password_manager::switches::kDisableManagerForSyncSignin))
return false;
@@ -539,7 +539,7 @@
std::string group_name =
base::FieldTrialList::FindFullName("AutofillSyncCredential");
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(
password_manager::switches::kAllowAutofillSyncCredential)) {
autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index 0a0ad29..be27fc3e 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -203,7 +203,7 @@
TEST_F(ChromePasswordManagerClientTest,
IsAutomaticPasswordSavingEnabledWhenFlagIsSetTest) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
password_manager::switches::kEnableAutomaticPasswordSaving);
if (chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_UNKNOWN)
EXPECT_TRUE(GetClient()->IsAutomaticPasswordSavingEnabled());
@@ -238,7 +238,7 @@
TEST_F(ChromePasswordManagerClientTest, ShouldFilterAutofillResult_Reauth) {
// Make client disallow only reauth requests.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitch(
password_manager::switches::kDisallowAutofillSyncCredentialForReauth);
scoped_ptr<TestChromePasswordManagerClient> client(
@@ -278,7 +278,7 @@
EXPECT_FALSE(client->ShouldFilterAutofillResult(form));
// Adding disallow switch should cause sync credential to be filtered.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitch(
password_manager::switches::kDisallowAutofillSyncCredential);
client.reset(new TestChromePasswordManagerClient(web_contents()));
diff --git a/chrome/browser/password_manager/password_generation_interactive_uitest.cc b/chrome/browser/password_manager/password_generation_interactive_uitest.cc
index 76bda7d..78702e9 100644
--- a/chrome/browser/password_manager/password_generation_interactive_uitest.cc
+++ b/chrome/browser/password_manager/password_generation_interactive_uitest.cc
@@ -48,7 +48,7 @@
class PasswordGenerationInteractiveTest : public InProcessBrowserTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Make sure the feature is enabled.
command_line->AppendSwitch(autofill::switches::kEnablePasswordGeneration);
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index 0669cb1..7747016 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -281,7 +281,7 @@
PasswordStoreFactory::GetInstance()->SetTestingFactory(
browser()->profile(), TestPasswordStoreService::Build);
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
- ASSERT_FALSE(CommandLine::ForCurrentProcess()->HasSwitch(
+ ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch(
password_manager::switches::kEnableAutomaticPasswordSaving));
}
@@ -638,7 +638,8 @@
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, PromptForXHRSubmit) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
NavigateToFile("/password/password_xhr_submit.html");
@@ -1051,7 +1052,7 @@
NavigateToFile("/password/password_form.html");
// Add the enable-automatic-password-saving switch.
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
password_manager::switches::kEnableAutomaticPasswordSaving);
// Fill a form and submit through a <input type="submit"> button.
@@ -1224,9 +1225,9 @@
IN_PROC_BROWSER_TEST_F(
PasswordManagerBrowserTest,
NoPromptForLoginFailedAndServerPushSeperateLoginForm_HttpsToHttp) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kAllowRunningInsecureContent);
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kIgnoreCertificateErrors);
const base::FilePath::CharType kDocRoot[] =
FILE_PATH_LITERAL("chrome/test/data");
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index 1577cdb5..cc2fa43 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -174,9 +174,10 @@
profile, Profile::EXPLICIT_ACCESS));
#elif defined(OS_MACOSX)
crypto::AppleKeychain* keychain =
- CommandLine::ForCurrentProcess()->HasSwitch(
- os_crypt::switches::kUseMockKeychain) ?
- new crypto::MockAppleKeychain() : new crypto::AppleKeychain();
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ os_crypt::switches::kUseMockKeychain)
+ ? new crypto::MockAppleKeychain()
+ : new crypto::AppleKeychain();
ps = new PasswordStoreMac(
main_thread_runner, db_thread_runner, keychain, login_db.release());
#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
@@ -190,7 +191,7 @@
// (In all cases we fall back on the basic store in case of failure.)
base::nix::DesktopEnvironment desktop_env;
std::string store_type =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kPasswordStore);
if (store_type == "kwallet") {
desktop_env = base::nix::DESKTOP_ENVIRONMENT_KDE4;
diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc
index 3b8fe77..853c8a77 100644
--- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc
+++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc
@@ -117,7 +117,7 @@
const GURL& url,
const std::set<std::string>& allowed_dev_channel_origins) {
// Allow access for tests.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnablePepperTesting)) {
return true;
}
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc
index 25d3516..1dd8d77 100644
--- a/chrome/browser/plugins/plugin_prefs.cc
+++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -250,7 +250,8 @@
// information.
// TODO(dspringer): When NaCl is on by default, remove this code.
if ((plugin.name == base::ASCIIToUTF16(nacl::kNaClPluginName)) &&
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl)) {
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableNaCl)) {
return true;
}
#endif
diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
index d956fb84a..e1ac91a 100644
--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -25,7 +25,7 @@
"https://www.gstatic.com/chrome/config/plugins_2/";
bool IsTest() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kPluginsMetadataServerURL);
}
@@ -42,7 +42,7 @@
#endif
std::string test_url =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kPluginsMetadataServerURL);
return GURL(IsTest() ? test_url : kPluginsServerUrl + filename);
}
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc
index ff061188..c010dff 100644
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -139,7 +139,7 @@
const base::Value* policy_value =
chrome_policy.GetValue(key::kEnableWebBasedSignin);
bool enabled = false;
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (policy_value && policy_value->GetAsBoolean(&enabled) && enabled &&
!command_line->HasSwitch(switches::kEnableWebBasedSignin)) {
command_line->AppendSwitch(switches::kEnableWebBasedSignin);
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index cdee0bd..01bc172 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -209,7 +209,7 @@
std::string url = test_server_->GetServiceURL().spec();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
invalidation::ProfileInvalidationProviderFactory::GetInstance()->
diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
index f76d5fb..f6f3ddb 100644
--- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc
@@ -50,7 +50,7 @@
~CloudPolicyManagerTest() override {}
void SetUpInProcessBrowserTestFixture() override {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitchASCII(switches::kDeviceManagementUrl,
"http://localhost");
}
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
index cb287ba..7ca11bfe 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
@@ -105,7 +105,7 @@
ComponentCloudPolicyTest() {}
~ComponentCloudPolicyTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
#if defined(OS_CHROMEOS)
// ExtensionBrowserTest sets the login users to a non-managed value;
@@ -123,7 +123,7 @@
ASSERT_TRUE(test_server_.Start());
std::string url = test_server_.GetServiceURL().spec();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc
index e194f95..ac88b5d 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc
@@ -29,7 +29,7 @@
namespace {
enterprise_management::DeviceRegisterRequest::Type GetRegistrationType() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kFakeCloudPolicyType))
return enterprise_management::DeviceRegisterRequest::BROWSER;
#if defined(OS_IOS)
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 845b28a4..400fb87 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -614,7 +614,7 @@
}
void SetUpInProcessBrowserTestFixture() override {
- CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs");
+ base::CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs");
EXPECT_CALL(provider_, IsInitializationComplete(_))
.WillRepeatedly(Return(true));
BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
@@ -840,7 +840,8 @@
IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -1498,7 +1499,8 @@
IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_WebStoreIconHidden) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -1641,7 +1643,7 @@
.AppendASCII("policy_shared_module")
.AppendASCII("update.xml");
GURL update_xml_url(URLRequestMockHTTPJob::GetMockUrl(update_xml_path));
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryUpdateURL, update_xml_url.spec());
ui_test_utils::NavigateToURL(browser(), update_xml_url);
@@ -2154,7 +2156,8 @@
IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -3047,7 +3050,7 @@
"http://bbb.com/empty.html",
};
-bool IsNonSwitchArgument(const CommandLine::StringType& s) {
+bool IsNonSwitchArgument(const base::CommandLine::StringType& s) {
return s.empty() || s[0] != '-';
}
@@ -3065,7 +3068,7 @@
virtual ~RestoreOnStartupPolicyTest() {}
#if defined(OS_CHROMEOS)
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
// TODO(nkostylev): Investigate if we can remove this switch.
command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests);
PolicyTest::SetUpCommandLine(command_line);
@@ -3079,8 +3082,8 @@
// Remove the non-switch arguments, so that session restore kicks in for
// these tests.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- CommandLine::StringVector argv = command_line->argv();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ base::CommandLine::StringVector argv = command_line->argv();
argv.erase(std::remove_if(++argv.begin(), argv.end(), IsNonSwitchArgument),
argv.end());
command_line->InitFromArgv(argv);
@@ -3208,7 +3211,8 @@
IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, RunTest) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -3327,7 +3331,8 @@
// TODO(tommi): Remove the kiosk mode flag when the whitelist is visible
// in the media exceptions UI.
// See discussion here: https://codereview.chromium.org/15738004/
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kKioskMode);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kKioskMode);
// Add an entry to the whitelist that allows the specified URL regardless
// of the setting of kAudioCapturedAllowed.
diff --git a/chrome/browser/policy/policy_helpers.cc b/chrome/browser/policy/policy_helpers.cc
index aeb28c8..5eb20512 100644
--- a/chrome/browser/policy/policy_helpers.cc
+++ b/chrome/browser/policy/policy_helpers.cc
@@ -23,7 +23,7 @@
#if defined(OS_CHROMEOS)
// On ChromeOS browsing is only allowed once OOBE has completed. Therefore all
// requests are blocked until this condition is met.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kOobeGuestSession)) {
if (!url.SchemeIs("chrome") && !url.SchemeIs("chrome-extension")) {
*reason = net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING;
diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
index 9224fdf..024279e 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
@@ -97,7 +97,7 @@
}
void SetUp() override {
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kPrerenderFromOmnibox,
switches::kPrerenderFromOmniboxSwitchValueEnabled);
diff --git a/chrome/browser/predictors/resource_prefetch_common.cc b/chrome/browser/predictors/resource_prefetch_common.cc
index 9c3f0d24..1ec32e18 100644
--- a/chrome/browser/predictors/resource_prefetch_common.cc
+++ b/chrome/browser/predictors/resource_prefetch_common.cc
@@ -60,10 +60,10 @@
// Enabled by command line switch. The config has the default params already
// set. The command line with just enable them with the default params.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSpeculativeResourcePrefetching)) {
const std::string value =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kSpeculativeResourcePrefetching);
if (value == switches::kSpeculativeResourcePrefetchingDisabled) {
diff --git a/chrome/browser/prefetch/prefetch_browsertest.cc b/chrome/browser/prefetch/prefetch_browsertest.cc
index cd3b57e..9ff446f 100644
--- a/chrome/browser/prefetch/prefetch_browsertest.cc
+++ b/chrome/browser/prefetch/prefetch_browsertest.cc
@@ -49,7 +49,7 @@
explicit PrefetchBrowserTestBase(bool disabled_via_field_trial)
: disabled_via_field_trial_(disabled_via_field_trial) {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
if (disabled_via_field_trial_) {
command_line->AppendSwitchASCII(switches::kForceFieldTrials,
"Prefetch/ExperimentDisabled/");
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 5b626ce..e82f472 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -397,9 +397,8 @@
factory->set_async(async);
factory->set_extension_prefs(extension_prefs);
- factory->set_command_line_prefs(
- make_scoped_refptr(
- new CommandLinePrefStore(CommandLine::ForCurrentProcess())));
+ factory->set_command_line_prefs(make_scoped_refptr(
+ new CommandLinePrefStore(base::CommandLine::ForCurrentProcess())));
factory->set_read_error_callback(base::Bind(&HandleReadError));
factory->set_user_prefs(user_pref_store);
}
diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index 8c840897..9813bf0 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc
@@ -46,7 +46,7 @@
EXPECT_FALSE(actual_bool_value);
// Change the command line.
- CommandLine cmd_line(CommandLine::NO_PROGRAM);
+ base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
cmd_line.AppendSwitch(switches::kEnableCloudPrintProxy);
// Call UpdateCommandLinePrefStore and check to see if the value has changed.
diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc
index c4d2490..53c3e67b 100644
--- a/chrome/browser/prefs/command_line_pref_store_unittest.cc
+++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc
@@ -23,7 +23,7 @@
class TestCommandLinePrefStore : public CommandLinePrefStore {
public:
- explicit TestCommandLinePrefStore(CommandLine* cl)
+ explicit TestCommandLinePrefStore(base::CommandLine* cl)
: CommandLinePrefStore(cl) {}
bool ProxySwitchesAreValid() {
@@ -64,7 +64,7 @@
// Tests a simple string pref on the command line.
TEST(CommandLinePrefStoreTest, SimpleStringPref) {
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
cl.AppendSwitchASCII(switches::kLang, "hi-MOM");
scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
@@ -77,7 +77,7 @@
// Tests a simple boolean pref on the command line.
TEST(CommandLinePrefStoreTest, SimpleBooleanPref) {
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
cl.AppendSwitch(switches::kNoProxyServer);
scoped_refptr<TestCommandLinePrefStore> store =
new TestCommandLinePrefStore(&cl);
@@ -87,7 +87,7 @@
// Tests a command line with no recognized prefs.
TEST(CommandLinePrefStoreTest, NoPrefs) {
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
cl.AppendSwitch(unknown_string);
cl.AppendSwitchASCII(unknown_bool, "a value");
scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
@@ -99,7 +99,7 @@
// Tests a complex command line with multiple known and unknown switches.
TEST(CommandLinePrefStoreTest, MultipleSwitches) {
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
cl.AppendSwitch(unknown_string);
cl.AppendSwitchASCII(switches::kProxyServer, "proxy");
cl.AppendSwitchASCII(switches::kProxyBypassList, "list");
@@ -129,7 +129,7 @@
// Tests proxy switch validation.
TEST(CommandLinePrefStoreTest, ProxySwitchValidation) {
- CommandLine cl(CommandLine::NO_PROGRAM);
+ base::CommandLine cl(base::CommandLine::NO_PROGRAM);
// No switches.
scoped_refptr<TestCommandLinePrefStore> store =
@@ -149,7 +149,7 @@
EXPECT_FALSE(store3->ProxySwitchesAreValid());
// All proxy switches except no-proxy.
- CommandLine cl2(CommandLine::NO_PROGRAM);
+ base::CommandLine cl2(base::CommandLine::NO_PROGRAM);
cl2.AppendSwitch(switches::kProxyAutoDetect);
cl2.AppendSwitchASCII(switches::kProxyServer, "server");
cl2.AppendSwitchASCII(switches::kProxyPacUrl, "url");
@@ -160,20 +160,20 @@
}
TEST(CommandLinePrefStoreTest, ManualProxyModeInference) {
- CommandLine cl1(CommandLine::NO_PROGRAM);
+ base::CommandLine cl1(base::CommandLine::NO_PROGRAM);
cl1.AppendSwitch(unknown_string);
cl1.AppendSwitchASCII(switches::kProxyServer, "proxy");
scoped_refptr<TestCommandLinePrefStore> store1 =
new TestCommandLinePrefStore(&cl1);
store1->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);
- CommandLine cl2(CommandLine::NO_PROGRAM);
+ base::CommandLine cl2(base::CommandLine::NO_PROGRAM);
cl2.AppendSwitchASCII(switches::kProxyPacUrl, "proxy");
scoped_refptr<TestCommandLinePrefStore> store2 =
new TestCommandLinePrefStore(&cl2);
store2->VerifyProxyMode(ProxyPrefs::MODE_PAC_SCRIPT);
- CommandLine cl3(CommandLine::NO_PROGRAM);
+ base::CommandLine cl3(base::CommandLine::NO_PROGRAM);
cl3.AppendSwitchASCII(switches::kProxyServer, std::string());
scoped_refptr<TestCommandLinePrefStore> store3 =
new TestCommandLinePrefStore(&cl3);
@@ -181,7 +181,7 @@
}
TEST(CommandLinePrefStoreTest, DisableSSLCipherSuites) {
- CommandLine cl1(CommandLine::NO_PROGRAM);
+ base::CommandLine cl1(base::CommandLine::NO_PROGRAM);
cl1.AppendSwitchASCII(switches::kCipherSuiteBlacklist,
"0x0004,0x0005");
scoped_refptr<TestCommandLinePrefStore> store1 =
@@ -193,7 +193,7 @@
store1->VerifySSLCipherSuites(expected_ciphers1,
arraysize(expected_ciphers1));
- CommandLine cl2(CommandLine::NO_PROGRAM);
+ base::CommandLine cl2(base::CommandLine::NO_PROGRAM);
cl2.AppendSwitchASCII(switches::kCipherSuiteBlacklist,
"0x0004, WHITESPACE_IGNORED TEST , 0x0005");
scoped_refptr<TestCommandLinePrefStore> store2 =
@@ -206,7 +206,7 @@
store2->VerifySSLCipherSuites(expected_ciphers2,
arraysize(expected_ciphers2));
- CommandLine cl3(CommandLine::NO_PROGRAM);
+ base::CommandLine cl3(base::CommandLine::NO_PROGRAM);
cl3.AppendSwitchASCII(switches::kCipherSuiteBlacklist,
"0x0004;MOAR;0x0005");
scoped_refptr<TestCommandLinePrefStore> store3 =
diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index 1861ac1..e0255d49 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -72,7 +72,7 @@
// static
bool IncognitoModePrefs::ShouldLaunchIncognito(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const PrefService* prefs) {
Availability incognito_avail = GetAvailability(prefs);
return incognito_avail != IncognitoModePrefs::DISABLED &&
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index c8134be..36e5758 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -40,7 +40,8 @@
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -114,7 +115,8 @@
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsLoaded, Test) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -174,7 +176,8 @@
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/prefs/pref_service_syncable_factory.cc b/chrome/browser/prefs/pref_service_syncable_factory.cc
index 9142d43..f047050f 100644
--- a/chrome/browser/prefs/pref_service_syncable_factory.cc
+++ b/chrome/browser/prefs/pref_service_syncable_factory.cc
@@ -46,7 +46,8 @@
}
#endif
-void PrefServiceSyncableFactory::SetCommandLine(CommandLine* command_line) {
+void PrefServiceSyncableFactory::SetCommandLine(
+ base::CommandLine* command_line) {
set_command_line_prefs(new CommandLinePrefStore(command_line));
}
diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
index 7e20c33d..b7a5213f 100644
--- a/chrome/browser/prefs/proxy_policy_unittest.cc
+++ b/chrome/browser/prefs/proxy_policy_unittest.cc
@@ -81,8 +81,7 @@
class ProxyPolicyTest : public testing::Test {
protected:
- ProxyPolicyTest()
- : command_line_(CommandLine::NO_PROGRAM) {}
+ ProxyPolicyTest() : command_line_(base::CommandLine::NO_PROGRAM) {}
void SetUp() override {
EXPECT_CALL(provider_, IsInitializationComplete(_))
@@ -110,7 +109,7 @@
}
base::MessageLoop loop_;
- CommandLine command_line_;
+ base::CommandLine command_line_;
MockConfigurationPolicyProvider provider_;
scoped_ptr<PolicyServiceImpl> policy_service_;
};
diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
index d60b998..8fdef230 100644
--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc
@@ -147,7 +147,7 @@
: protection_level_(GetProtectionLevelFromTrialGroup(GetParam())) {
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
EXPECT_FALSE(command_line->HasSwitch(switches::kForceFieldTrials));
command_line->AppendSwitchASCII(
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 710c94b..4bf0a3b 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1069,7 +1069,7 @@
#endif
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kPrerenderMode,
switches::kPrerenderModeSwitchValueEnabled);
#if defined(OS_MACOSX)
@@ -3513,7 +3513,7 @@
PrerenderBrowserTestWithNaCl() {}
~PrerenderBrowserTestWithNaCl() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
PrerenderBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableNaCl);
}
@@ -3524,7 +3524,8 @@
PrerenderNaClPluginEnabled) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -3601,7 +3602,7 @@
void SetUp() override { PrerenderBrowserTest::SetUp(); }
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
PrerenderBrowserTest::SetUpCommandLine(command_line);
ExtensionApiTest::SetUpCommandLine(command_line);
}
diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc
index 02ed022..468d44b 100644
--- a/chrome/browser/prerender/prerender_field_trial.cc
+++ b/chrome/browser/prerender/prerender_field_trial.cc
@@ -197,7 +197,7 @@
} // end namespace
-void ConfigurePrerender(const CommandLine& command_line) {
+void ConfigurePrerender(const base::CommandLine& command_line) {
enum PrerenderOption {
PRERENDER_OPTION_AUTO,
PRERENDER_OPTION_DISABLED,
@@ -249,10 +249,10 @@
return false;
// Override any field trial groups if the user has set a command line flag.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kPrerenderFromOmnibox)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kPrerenderFromOmnibox)) {
const string switch_value =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kPrerenderFromOmnibox);
if (switch_value == switches::kPrerenderFromOmniboxSwitchValueEnabled)
@@ -302,10 +302,9 @@
#if defined(OS_ANDROID) || defined(OS_IOS)
return false;
#endif
- return
- !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisablePrerenderLocalPredictor) &&
- GetLocalPredictorSpecValue(kLocalPredictorKeyName) == kEnabledGroup;
+ return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePrerenderLocalPredictor) &&
+ GetLocalPredictorSpecValue(kLocalPredictorKeyName) == kEnabledGroup;
}
bool ShouldDisableLocalPredictorBasedOnSyncAndConfiguration(Profile* profile) {
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
index b772048..6f3718d 100644
--- a/chrome/browser/prerender/prerender_unittest.cc
+++ b/chrome/browser/prerender/prerender_unittest.cc
@@ -321,7 +321,7 @@
last_prerender_id_(0),
field_trial_list_(NULL) {
// Enable omnibox prerendering.
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kPrerenderFromOmnibox,
switches::kPrerenderFromOmniboxSwitchValueEnabled);
}
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
index 546f1129..7bd2734 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -145,7 +145,7 @@
return;
base::FilePath list_path(
- CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
switches::kCloudPrintSetupProxy));
if (!list_path.empty()) {
std::string printers_json;
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
index b0d6613..c5861c0 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
@@ -206,7 +206,7 @@
: ui_thread_(content::BrowserThread::UI, &message_loop_) {
}
- bool LaunchBrowser(const CommandLine& command_line, Profile* profile) {
+ bool LaunchBrowser(const base::CommandLine& command_line, Profile* profile) {
int return_code = 0;
StartupBrowserCreator browser_creator;
return StartupBrowserCreator::ProcessCmdLineImpl(
@@ -461,7 +461,7 @@
CloudPrintProxyServiceFactory::GetInstance()->
SetTestingFactory(&profile_, TestCloudPrintProxyServiceFactory);
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
EXPECT_FALSE(LaunchBrowser(command_line, &profile_));
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
index 5b8087d..eefa0e3 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
@@ -31,13 +31,14 @@
IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, NormalPassedFlag) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
base::FilePath test_file_path = ui_test_utils::GetTestFilePath(
base::FilePath(), base::FilePath().AppendASCII("empty.html"));
- CommandLine new_command_line(GetCommandLineForRelaunch());
+ base::CommandLine new_command_line(GetCommandLineForRelaunch());
new_command_line.AppendArgPath(test_file_path);
content::WindowedNotificationObserver observer(
@@ -59,7 +60,7 @@
// Disabled due to http://crbug.com/144393.
IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, DISABLED_CloudPrintPolicyFlag) {
- CommandLine new_command_line(GetCommandLineForRelaunch());
+ base::CommandLine new_command_line(GetCommandLineForRelaunch());
new_command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
// This is important for the test as the way the browser process is launched
// here causes the predictor databases to be initialized multiple times. This
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
index e4bb81b9..fd4be0b 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc
@@ -212,7 +212,7 @@
int CloudPrintMockService_Main(SetExpectationsCallback set_expectations) {
base::MessageLoopForUI main_message_loop;
main_message_loop.set_thread_name("Main Thread");
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
content::RegisterPathProvider();
#if defined(OS_MACOSX)
@@ -258,10 +258,10 @@
// Connect up the parent/child IPC channel to signal that the test can
// continue.
TestStartupClientChannelListener listener;
- EXPECT_TRUE(CommandLine::ForCurrentProcess()->HasSwitch(
+ EXPECT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kProcessChannelID));
std::string startup_channel_name =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kProcessChannelID);
scoped_ptr<IPC::ChannelProxy> startup_channel;
startup_channel =
@@ -318,9 +318,9 @@
void OnChannelConnected(int32 peer_pid) override;
// MultiProcessTest implementation.
- CommandLine MakeCmdLine(const std::string& procname) override;
+ base::CommandLine MakeCmdLine(const std::string& procname) override;
- bool LaunchBrowser(const CommandLine& command_line, Profile* profile) {
+ bool LaunchBrowser(const base::CommandLine& command_line, Profile* profile) {
int return_code = 0;
StartupBrowserCreator browser_creator;
return StartupBrowserCreator::ProcessCmdLineImpl(
@@ -407,7 +407,7 @@
// from InProcessBrowserTest::SetUp(). These tests require a more complex
// process startup so they are unable to just inherit from
// InProcessBrowserTest.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
base::FilePath user_data_dir =
command_line->GetSwitchValuePath(switches::kUserDataDir);
if (user_data_dir.empty()) {
@@ -490,9 +490,9 @@
observer_.Notify();
}
-CommandLine CloudPrintProxyPolicyStartupTest::MakeCmdLine(
+base::CommandLine CloudPrintProxyPolicyStartupTest::MakeCmdLine(
const std::string& procname) {
- CommandLine cl = MultiProcessTest::MakeCmdLine(procname);
+ base::CommandLine cl = MultiProcessTest::MakeCmdLine(procname);
cl.AppendSwitchASCII(switches::kProcessChannelID, startup_channel_id_);
#if defined(OS_MACOSX)
cl.AppendSwitchASCII(kTestExecutablePath, executable_path_.value());
@@ -552,7 +552,7 @@
prefs::kCloudPrintEmail,
new base::StringValue(MockServiceIPCServer::EnabledUserId()));
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
test_launcher_utils::PrepareBrowserCommandLineForTests(&command_line);
@@ -602,7 +602,7 @@
prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled,
new base::FundamentalValue(false));
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kCheckCloudPrintConnectorPolicy);
test_launcher_utils::PrepareBrowserCommandLineForTests(&command_line);
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index fa26a10..1fbfbdd 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -196,13 +196,13 @@
return result;
}
-base::string16 GetSwitchValueString16(const CommandLine& command_line,
+base::string16 GetSwitchValueString16(const base::CommandLine& command_line,
const char* switchName) {
#if defined(OS_WIN)
return command_line.GetSwitchValueNative(switchName);
#elif defined(OS_POSIX)
// POSIX Command line string types are different.
- CommandLine::StringType native_switch_val;
+ base::CommandLine::StringType native_switch_val;
native_switch_val = command_line.GetSwitchValueASCII(switchName);
// Convert the ASCII string to UTF16 to prepare to pass.
return base::ASCIIToUTF16(native_switch_val);
@@ -748,7 +748,7 @@
}
bool CreatePrintDialogFromCommandLine(Profile* profile,
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
DCHECK(command_line.HasSwitch(switches::kCloudPrintFile));
if (!command_line.GetSwitchValuePath(switches::kCloudPrintFile).empty()) {
base::FilePath cloud_print_file;
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index cc593ba..277c507 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -56,7 +56,7 @@
base::DeleteFile(emf_path_, true);
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchPath(switches::kDebugPrint, emf_path_);
}
@@ -236,7 +236,7 @@
}
static bool GenerateFiles() {
- return CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch);
}
base::FilePath emf_path_;
diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc
index fba77f8..f2a00198 100644
--- a/chrome/browser/process_info_snapshot_mac.cc
+++ b/chrome/browser/process_info_snapshot_mac.cc
@@ -130,7 +130,7 @@
const std::vector<base::ProcessId>& pid_list,
std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
const base::FilePath kProgram("/bin/ps");
- CommandLine command_line(kProgram);
+ base::CommandLine command_line(kProgram);
// Get resident set size, virtual memory size.
command_line.AppendArg("-o");
@@ -193,7 +193,7 @@
static bool GetProcessMemoryInfoUsingTop(
std::map<int,ProcessInfoSnapshot::ProcInfoEntry>& proc_info_entries) {
const base::FilePath kProgram("/usr/bin/top");
- CommandLine command_line(kProgram);
+ base::CommandLine command_line(kProgram);
// -stats tells top to print just the given fields as ordered.
command_line.AppendArg("-stats");
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index 16262f7..bd85335 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -61,7 +61,7 @@
// UITest::LaunchBrowserHelper somehow?
base::FilePath program;
ASSERT_TRUE(PathService::Get(base::FILE_EXE, &program));
- CommandLine command_line(program);
+ base::CommandLine command_line(program);
command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir_);
if (first_run)
@@ -71,10 +71,11 @@
// Add the normal test-mode switches, except for the ones we're adding
// ourselves.
- CommandLine standard_switches(CommandLine::NO_PROGRAM);
+ base::CommandLine standard_switches(base::CommandLine::NO_PROGRAM);
test_launcher_utils::PrepareBrowserCommandLineForTests(&standard_switches);
- const CommandLine::SwitchMap& switch_map = standard_switches.GetSwitches();
- for (CommandLine::SwitchMap::const_iterator i = switch_map.begin();
+ const base::CommandLine::SwitchMap& switch_map =
+ standard_switches.GetSwitches();
+ for (base::CommandLine::SwitchMap::const_iterator i = switch_map.begin();
i != switch_map.end(); ++i) {
const std::string& switch_name = i->first;
if (switch_name == switches::kUserDataDir ||
diff --git a/chrome/browser/process_singleton_modal_dialog_lock.cc b/chrome/browser/process_singleton_modal_dialog_lock.cc
index 34011a7..98627c1 100644
--- a/chrome/browser/process_singleton_modal_dialog_lock.cc
+++ b/chrome/browser/process_singleton_modal_dialog_lock.cc
@@ -54,8 +54,8 @@
}
bool ProcessSingletonModalDialogLock::NotificationCallbackImpl(
- const CommandLine& command_line,
- const base::FilePath& current_directory) {
+ const base::CommandLine& command_line,
+ const base::FilePath& current_directory) {
if (active_dialog_ != NULL) {
set_foreground_window_handler_.Run(active_dialog_);
return true;
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
index d46ea97..05e14995 100644
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -622,7 +622,7 @@
DCHECK(ui_message_loop_ == base::MessageLoop::current());
DCHECK(reader);
- if (parent_->notification_callback_.Run(CommandLine(argv),
+ if (parent_->notification_callback_.Run(base::CommandLine(argv),
base::FilePath(current_dir))) {
// Send back "ACK" message to prevent the client process from starting up.
reader->FinishWithACK(kACKToken, arraysize(kACKToken) - 1);
@@ -755,14 +755,12 @@
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
return NotifyOtherProcessWithTimeout(
- *CommandLine::ForCurrentProcess(),
- kRetryAttempts,
- base::TimeDelta::FromSeconds(kTimeoutInSeconds),
- true);
+ *base::CommandLine::ForCurrentProcess(), kRetryAttempts,
+ base::TimeDelta::FromSeconds(kTimeoutInSeconds), true);
}
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
- const CommandLine& cmd_line,
+ const base::CommandLine& cmd_line,
int retry_attempts,
const base::TimeDelta& timeout,
bool kill_unresponsive) {
@@ -897,14 +895,13 @@
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
return NotifyOtherProcessWithTimeoutOrCreate(
- *CommandLine::ForCurrentProcess(),
- kRetryAttempts,
+ *base::CommandLine::ForCurrentProcess(), kRetryAttempts,
base::TimeDelta::FromSeconds(kTimeoutInSeconds));
}
ProcessSingleton::NotifyResult
ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
int retry_attempts,
const base::TimeDelta& timeout) {
NotifyResult result = NotifyOtherProcessWithTimeout(
diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc
index f12e3ff44..f50e760c 100644
--- a/chrome/browser/process_singleton_posix_unittest.cc
+++ b/chrome/browser/process_singleton_posix_unittest.cc
@@ -46,8 +46,7 @@
base::Bind(&TestableProcessSingleton::NotificationCallback,
base::Unretained(this))) {}
-
- std::vector<CommandLine::StringVector> callback_command_lines_;
+ std::vector<base::CommandLine::StringVector> callback_command_lines_;
using ProcessSingleton::NotifyOtherProcessWithTimeout;
using ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate;
@@ -55,7 +54,7 @@
using ProcessSingleton::OverrideKillCallbackForTesting;
private:
- bool NotificationCallback(const CommandLine& command_line,
+ bool NotificationCallback(const base::CommandLine& command_line,
const base::FilePath& current_directory) {
callback_command_lines_.push_back(command_line.argv());
return true;
@@ -163,7 +162,8 @@
ProcessSingleton::NotifyResult NotifyOtherProcess(bool override_kill) {
scoped_ptr<TestableProcessSingleton> process_singleton(
CreateProcessSingleton());
- CommandLine command_line(CommandLine::ForCurrentProcess()->GetProgram());
+ base::CommandLine command_line(
+ base::CommandLine::ForCurrentProcess()->GetProgram());
command_line.AppendArg("about:blank");
if (override_kill) {
process_singleton->OverrideCurrentPidForTesting(
@@ -182,7 +182,8 @@
const std::string& url) {
scoped_ptr<TestableProcessSingleton> process_singleton(
CreateProcessSingleton());
- CommandLine command_line(CommandLine::ForCurrentProcess()->GetProgram());
+ base::CommandLine command_line(
+ base::CommandLine::ForCurrentProcess()->GetProgram());
command_line.AppendArg(url);
return process_singleton->NotifyOtherProcessWithTimeoutOrCreate(
command_line, kRetryAttempts, timeout());
diff --git a/chrome/browser/process_singleton_startup_lock.cc b/chrome/browser/process_singleton_startup_lock.cc
index cd3c0f70..f564de7 100644
--- a/chrome/browser/process_singleton_startup_lock.cc
+++ b/chrome/browser/process_singleton_startup_lock.cc
@@ -32,14 +32,14 @@
it != saved_startup_messages_.end(); ++it) {
if (replayed_messages.find(*it) != replayed_messages.end())
continue;
- original_callback_.Run(CommandLine(it->first), it->second);
+ original_callback_.Run(base::CommandLine(it->first), it->second);
replayed_messages.insert(*it);
}
saved_startup_messages_.clear();
}
bool ProcessSingletonStartupLock::NotificationCallbackImpl(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const base::FilePath& current_directory) {
if (locked_) {
// If locked, it means we are not ready to process this message because
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 960d6d8..c5f0f999 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -91,7 +91,7 @@
}
bool ParseCommandLine(const COPYDATASTRUCT* cds,
- CommandLine* parsed_command_line,
+ base::CommandLine* parsed_command_line,
base::FilePath* current_directory) {
// We should have enough room for the shortest command (min_message_size)
// and also be a multiple of wchar_t bytes. The shortest command
@@ -144,7 +144,7 @@
// Get command line.
const std::wstring cmd_line =
msg.substr(second_null + 1, third_null - second_null);
- *parsed_command_line = CommandLine::FromString(cmd_line);
+ *parsed_command_line = base::CommandLine::FromString(cmd_line);
return true;
}
return false;
@@ -162,7 +162,7 @@
// Handle the WM_COPYDATA message from another process.
const COPYDATASTRUCT* cds = reinterpret_cast<COPYDATASTRUCT*>(lparam);
- CommandLine parsed_command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
base::FilePath current_directory;
if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) {
*result = TRUE;
@@ -333,7 +333,7 @@
result = PROFILE_IN_USE;
} else {
g_browser_process->platform_part()->PlatformSpecificCommandLineProcessing(
- *CommandLine::ForCurrentProcess());
+ *base::CommandLine::ForCurrentProcess());
}
return result;
}
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 414aae3..6700d55 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -205,8 +205,9 @@
bool Profile::IsGuestSession() const {
#if defined(OS_CHROMEOS)
- static bool is_guest_session = CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kGuestSession);
+ static bool is_guest_session =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kGuestSession);
return is_guest_session;
#else
return GetPath() == ProfileManager::GetGuestProfilePath();
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index 5a43b752..ec06bd7 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -92,7 +92,7 @@
class ProfileBrowserTest : public InProcessBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
command_line->AppendSwitch(
chromeos::switches::kIgnoreUserProfileMappingForTests);
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 24b5935..eba46a35 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -431,7 +431,8 @@
// Determine if prefetch is enabled for this profile.
// If not profile_manager is present, it means we are in a unittest.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
predictor_ = chrome_browser_net::Predictor::CreatePredictor(
!command_line->HasSwitch(switches::kDisablePreconnect),
!command_line->HasSwitch(switches::kDnsPrefetchDisable),
@@ -591,7 +592,8 @@
// or launch-on-startup support unless kKeepAliveForTest is set.
bool init_background_mode_manager = true;
#if defined(OS_CHROMEOS)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kKeepAliveForTest))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kKeepAliveForTest))
init_background_mode_manager = false;
#endif
if (init_background_mode_manager) {
@@ -628,7 +630,7 @@
#else
SessionStartupPref::Type startup_pref_type =
StartupBrowserCreator::GetSessionStartupPref(
- *CommandLine::ForCurrentProcess(), this).type;
+ *base::CommandLine::ForCurrentProcess(), this).type;
#endif
content::CookieStoreConfig::SessionCookieMode session_cookie_mode =
content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES;
@@ -1306,7 +1308,8 @@
GURL ProfileImpl::GetHomePage() {
// --homepage overrides any preferences.
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kHomePage)) {
// TODO(evanm): clean up usage of DIR_CURRENT.
// http://code.google.com/p/chromium/issues/detail?id=60630
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 5349f1a..74b1727b 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -68,7 +68,8 @@
#if defined(OS_ANDROID)
return net::CACHE_BACKEND_SIMPLE;
#else
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kUseSimpleCacheBackend)) {
const std::string opt_value =
command_line.GetSwitchValueASCII(switches::kUseSimpleCacheBackend);
@@ -912,6 +913,6 @@
bool ProfileImplIOData::IsDataReductionProxyEnabled() const {
return data_reduction_proxy_enabled_.GetValue() ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- data_reduction_proxy::switches::kEnableDataReductionProxy);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ data_reduction_proxy::switches::kEnableDataReductionProxy);
}
diff --git a/chrome/browser/profiles/profile_info_cache_unittest.cc b/chrome/browser/profiles/profile_info_cache_unittest.cc
index d465c5a..9b808ac5 100644
--- a/chrome/browser/profiles/profile_info_cache_unittest.cc
+++ b/chrome/browser/profiles/profile_info_cache_unittest.cc
@@ -538,7 +538,8 @@
// High res avatar downloading is only supported on desktop.
#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_CHROMEOS)
TEST_F(ProfileInfoCacheTest, DownloadHighResAvatarTest) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
base::FilePath path_1 = GetProfilePath("path_1");
@@ -592,7 +593,8 @@
}
TEST_F(ProfileInfoCacheTest, MigrateLegacyProfileNamesWithNewAvatarMenu) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
base::FilePath path_1 = GetProfilePath("path_1");
@@ -639,7 +641,8 @@
TEST_F(ProfileInfoCacheTest,
DontMigrateLegacyProfileNamesWithoutNewAvatarMenu) {
- switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::DisableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
EXPECT_EQ(0U, GetCache()->GetNumberOfProfiles());
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 50d7970..9adb874 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -1021,7 +1021,8 @@
IOThread* const io_thread = profile_params_->io_thread;
IOThread::Globals* const io_thread_globals = io_thread->globals();
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
// TODO(vadimt): Remove ScopedTracker below once crbug.com/436671 is fixed.
tracked_objects::ScopedTracker tracking_profile1(
diff --git a/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chrome/browser/profiles/profile_list_desktop_browsertest.cc
index 1319d235..b49e226 100644
--- a/chrome/browser/profiles/profile_list_desktop_browsertest.cc
+++ b/chrome/browser/profiles/profile_list_desktop_browsertest.cc
@@ -93,7 +93,8 @@
IN_PROC_BROWSER_TEST_F(ProfileListDesktopBrowserTest, MAYBE_SwitchToProfile) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc
index b4e74a34..95f03c4 100644
--- a/chrome/browser/profiles/profile_list_desktop_unittest.cc
+++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc
@@ -285,7 +285,8 @@
}
TEST_F(ProfileListDesktopTest, DontShowOldAvatarMenuForSingleProfile) {
- switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::DisableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
manager()->CreateTestingProfile("Test 1");
@@ -306,7 +307,8 @@
if (!profiles::IsMultipleProfilesEnabled())
return;
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
manager()->CreateTestingProfile("Test 1");
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 5a5f94b..cf1aaa1f 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -792,7 +792,7 @@
if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileName))
profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
bool force_supervised_user_id =
command_line->HasSwitch(switches::kSupervisedUserId);
if (force_supervised_user_id) {
@@ -834,7 +834,8 @@
if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
logged_in_ = true;
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kTestType)) {
// If we don't have a mounted profile directory we're in trouble.
// TODO(davemoore) Once we have better api this check should ensure that
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc
index beae82c..1a89c12 100644
--- a/chrome/browser/profiles/profile_manager_browsertest.cc
+++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -122,7 +122,7 @@
// platforms.
class ProfileManagerBrowserTest : public InProcessBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
command_line->AppendSwitch(
chromeos::switches::kIgnoreUserProfileMappingForTests);
@@ -215,7 +215,7 @@
class ProfileManagerCrOSBrowserTest : public ProfileManagerBrowserTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
// Use a user hash other than the default chrome::kTestUserProfileDir
// so that the prefix case is tested.
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
@@ -270,7 +270,8 @@
SwitchToProfile) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -338,7 +339,8 @@
IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_EphemeralProfile) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index e3f02ad..c3ffe9e 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -110,7 +110,7 @@
new UnittestProfileManager(temp_dir_.path()));
#if defined(OS_CHROMEOS)
- CommandLine* cl = CommandLine::ForCurrentProcess();
+ base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
cl->AppendSwitch(switches::kTestType);
#endif
}
@@ -408,7 +408,7 @@
new UnittestGuestProfileManager(temp_dir_.path()));
#if defined(OS_CHROMEOS)
- CommandLine* cl = CommandLine::ForCurrentProcess();
+ base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
// This switch is needed to skip non-test specific behavior in
// ProfileManager (accessing DBusThreadManager).
cl->AppendSwitch(switches::kTestType);
@@ -994,7 +994,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
@@ -1032,7 +1033,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
@@ -1078,7 +1080,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
@@ -1132,7 +1135,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
index e0b6b8614..7327fab 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -643,7 +643,7 @@
// static
bool ProfileShortcutManager::IsFeatureEnabled() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return command_line->HasSwitch(switches::kEnableProfileShortcutManager) ||
(BrowserDistribution::GetDistribution()->CanCreateDesktopShortcuts() &&
!command_line->HasSwitch(switches::kUserDataDir));
@@ -701,7 +701,7 @@
void ProfileShortcutManagerWin::GetShortcutProperties(
const base::FilePath& profile_path,
- CommandLine* command_line,
+ base::CommandLine* command_line,
base::string16* name,
base::FilePath* icon_path) {
base::FilePath chrome_exe;
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 1b4c1317..320388f 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -257,7 +257,7 @@
}
content::RecordAction(UserMetricsAction("NewWindow"));
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
int return_code;
StartupBrowserCreator browser_creator;
browser_creator.LaunchBrowser(command_line, profile, base::FilePath(),
@@ -455,7 +455,7 @@
true);
switches::EnableNewProfileManagementForTesting(
- CommandLine::ForCurrentProcess());
+ base::CommandLine::ForCurrentProcess());
UserManager::Show(base::FilePath(),
profiles::USER_MANAGER_TUTORIAL_OVERVIEW,
profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc
index bfbc5051..9cb444b 100644
--- a/chrome/browser/referrer_policy_browsertest.cc
+++ b/chrome/browser/referrer_policy_browsertest.cc
@@ -617,7 +617,7 @@
}
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpLeftClickRedirectDefaultFlag) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kReducedReferrerGranularity);
RunReferrerTest(blink::WebReferrerPolicyDefault, START_ON_HTTP, REGULAR_LINK,
SERVER_REDIRECT_FROM_HTTP_TO_HTTPS, CURRENT_TAB,
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.cc b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.cc
index 56d7c57..9fdf92d 100644
--- a/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.cc
+++ b/chrome/browser/renderer_context_menu/context_menu_content_type_platform_app.cc
@@ -38,7 +38,7 @@
// Add dev tools for unpacked extensions.
return extensions::Manifest::IsUnpackedLocation(
platform_app->location()) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDebugPackedApps);
default:
return false;
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index dcb6fd8..e0d1fc9 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1724,7 +1724,8 @@
bool RenderViewContextMenu::IsDevCommandEnabled(int id) const {
if (id == IDC_CONTENT_CONTEXT_INSPECTELEMENT ||
id == IDC_CONTENT_CONTEXT_INSPECTBACKGROUNDPAGE) {
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (!GetPrefs(browser_context_)
->GetBoolean(prefs::kWebKitJavascriptEnabled) ||
command_line->HasSwitch(switches::kDisableJavaScript))
diff --git a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
index 110dd30..dafc01e 100644
--- a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
+++ b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc
@@ -77,7 +77,8 @@
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
// Add a check item "Automatically correct spelling".
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableSpellingAutoCorrect)) {
submenu_model_.AddCheckItem(IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE,
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_AUTOCORRECT));
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
index 5cdc005..01bb5f6d 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -171,7 +171,8 @@
proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE,
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableSpellingAutoCorrect)) {
proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE,
l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_AUTOCORRECT));
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index 16c238f..27d0c77 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -219,7 +219,7 @@
class ChromeRenderProcessHostTestWithCommandLine
: public ChromeRenderProcessHostTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
}
};
@@ -235,7 +235,8 @@
// Set max renderers to 1 to force running out of processes.
content::RenderProcessHost::SetMaxRendererProcessCount(1);
- CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ base::CommandLine& parsed_command_line =
+ *base::CommandLine::ForCurrentProcess();
parsed_command_line.AppendSwitch(switches::kProcessPerTab);
int tab_count = 1;
@@ -301,7 +302,8 @@
LOG(ERROR) << "Can't background processes";
return;
}
- CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ base::CommandLine& parsed_command_line =
+ *base::CommandLine::ForCurrentProcess();
parsed_command_line.AppendSwitch(switches::kProcessPerTab);
// Change the first tab to be the omnibox page (TYPE_WEBUI).
@@ -377,11 +379,13 @@
DevToolsOnSelfInOwnProcessPPT) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
- CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ base::CommandLine& parsed_command_line =
+ *base::CommandLine::ForCurrentProcess();
parsed_command_line.AppendSwitch(switches::kProcessPerTab);
int tab_count = 1;
@@ -427,7 +431,8 @@
DevToolsOnSelfInOwnProcess) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/resources/pdf/pdf_extension_test.cc b/chrome/browser/resources/pdf/pdf_extension_test.cc
index fc830416..e738d4fc 100644
--- a/chrome/browser/resources/pdf/pdf_extension_test.cc
+++ b/chrome/browser/resources/pdf/pdf_extension_test.cc
@@ -22,7 +22,7 @@
public:
virtual ~PDFExtensionTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableOutOfProcessPdf);
}
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index b740c434..2bc26fd 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -250,7 +250,7 @@
// iOS does not have a notion of startpages.
SessionStartupPref session_startup_prefs =
StartupBrowserCreator::GetSessionStartupPref(
- *CommandLine::ForCurrentProcess(), profile);
+ *base::CommandLine::ForCurrentProcess(), profile);
if (session_startup_prefs.type == SessionStartupPref::URLS) {
is_google_in_startpages =
std::count_if(session_startup_prefs.urls.begin(),
@@ -288,7 +288,7 @@
send_ping_immediately_ = send_ping_immediately;
// Enable zero delays for testing.
- if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType))
EnableZeroDelayForTesting();
delay = std::min(kMaxInitDelay, std::max(min_init_delay_, delay));
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 31ead23a..09f44b9 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -259,8 +259,8 @@
}
void ClientSideDetectionService::ScheduleFetchModel(int64 delay_ms) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSbDisableAutoUpdate))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSbDisableAutoUpdate))
return;
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index 5b4845d..fc599466 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -274,7 +274,7 @@
// Android only supports a subset of FULL_SAFE_BROWSING.
// TODO(shess): This shouldn't be OS-driven <http://crbug.com/394379>
#if !defined(OS_ANDROID)
- CommandLine* cmdline = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
enable_download_protection_ =
!cmdline->HasSwitch(switches::kSbDisableDownloadProtection);
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 49cd742..bd471fe4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -351,7 +351,7 @@
InProcessBrowserTest::SetUp();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(
switches::kForceFieldTrials, "UwSInterstitialStatus/On/");
}
@@ -608,7 +608,8 @@
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, DontProceed) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -641,7 +642,8 @@
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, IframeDontProceed) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -727,7 +729,8 @@
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ProceedDisabled) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -758,7 +761,8 @@
IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ReportingDisabled) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 88750c18b..e5c8fd5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -219,7 +219,7 @@
#if defined(FULL_SAFE_BROWSING)
#if !defined(OS_ANDROID)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableClientSidePhishingDetection)) {
csd_service_.reset(safe_browsing::ClientSideDetectionService::Create(
url_request_context_getter_.get()));
@@ -443,7 +443,7 @@
#endif
#endif // defined(OS_WIN)
- CommandLine* cmdline = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
config.disable_auto_update =
cmdline->HasSwitch(switches::kSbDisableAutoUpdate) ||
cmdline->HasSwitch(switches::kDisableBackgroundNetworking);
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 9b5311b..0ce5515 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -404,7 +404,7 @@
SafeBrowsingService::RegisterFactory(NULL);
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
// Makes sure the auto update is not triggered during the test.
// This test will fill up the database using testing prefixes
// and urls.
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index c4b272ec..6c24148 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -280,7 +280,7 @@
SafeBrowsingService::RegisterFactory(NULL);
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// This test uses loopback. No need to use IPv6 especially it makes
// local requests slow on Windows trybot when ipv6 local address [::1]
// is not setup.
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index 9b2623f1..93c3089 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -277,7 +277,7 @@
return true;
}
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return !command_line->HasSwitch(switches::kDisableExperimentalHotwording);
}
@@ -355,7 +355,7 @@
// Show the hotword notification in 5 seconds if the experimental flag is
// on, or in 30 minutes if not. We need to wait at least a few seconds
// for the hotword extension to be installed.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableExperimentalHotwordHardware)) {
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
diff --git a/chrome/browser/search/hotword_service_factory.cc b/chrome/browser/search/hotword_service_factory.cc
index 44d34131..91c7fcbe 100644
--- a/chrome/browser/search/hotword_service_factory.cc
+++ b/chrome/browser/search/hotword_service_factory.cc
@@ -47,7 +47,7 @@
// Fill in once the hardware has the correct interface implemented.
// In the meantime, this function can be used to get other parts moving
// based on a flag.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return command_line->HasSwitch(switches::kEnableExperimentalHotwordHardware);
}
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 925e419..a1d5a710 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -330,7 +330,8 @@
if (!IsInstantExtendedAPIEnabled())
return false;
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEnableQueryExtraction))
return true;
@@ -534,7 +535,7 @@
return false;
#if defined(OS_ANDROID)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kPrefetchSearchResults)) {
return true;
}
@@ -583,7 +584,7 @@
}
DisplaySearchButtonConditions GetDisplaySearchButtonConditions() {
- const CommandLine* cl = CommandLine::ForCurrentProcess();
+ const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kDisableSearchButtonInOmnibox))
return DISPLAY_SEARCH_BUTTON_NEVER;
if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxForStr))
@@ -608,7 +609,7 @@
}
OriginChipCondition GetOriginChipCondition() {
- const CommandLine* cl = CommandLine::ForCurrentProcess();
+ const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kDisableOriginChip))
return ORIGIN_CHIP_DISABLED;
if (cl->HasSwitch(switches::kEnableOriginChipAlways))
@@ -731,7 +732,7 @@
}
void EnableQueryExtractionForTesting() {
- CommandLine* cl = CommandLine::ForCurrentProcess();
+ base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
cl->AppendSwitch(switches::kEnableQueryExtraction);
}
diff --git a/chrome/browser/search/search_android_unittest.cc b/chrome/browser/search/search_android_unittest.cc
index 9d168d1..7c30dcb 100644
--- a/chrome/browser/search/search_android_unittest.cc
+++ b/chrome/browser/search/search_android_unittest.cc
@@ -70,7 +70,7 @@
}
TEST_F(SearchUtilTest, ShouldPrefetchSearchResults_EnabledViaCommandLine) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kPrefetchSearchResults);
// Command-line enable should override Finch.
ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index b31ab05..489cba8 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -529,8 +529,8 @@
// However, if the Google base URL is specified on the command line, the
// instant URL should just use it, even if it's HTTP.
UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
- "http://www.bar.com/");
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ switches::kGoogleBaseURL, "http://www.bar.com/");
instant_url = GetInstantURL(profile(), false);
ASSERT_TRUE(instant_url.is_valid());
EXPECT_EQ("http://www.bar.com/webhp?strk", instant_url.spec());
@@ -543,7 +543,7 @@
// If we specify extra search query params, they should be inserted into the
// query portion of the instant URL.
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kExtraSearchQueryParams, "a=b");
instant_url = GetInstantURL(profile(), false);
ASSERT_TRUE(instant_url.is_valid());
@@ -891,7 +891,7 @@
}
TEST_F(DisplaySearchButtonTest, CommandLineNever) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableSearchButtonInOmnibox);
EXPECT_EQ(DISPLAY_SEARCH_BUTTON_NEVER, GetDisplaySearchButtonConditions());
@@ -908,7 +908,7 @@
}
TEST_F(DisplaySearchButtonTest, CommandLineForSearchTermReplacement) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableSearchButtonInOmniboxForStr);
EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR, GetDisplaySearchButtonConditions());
}
@@ -922,7 +922,7 @@
TEST_F(DisplaySearchButtonTest,
CommandLineForSearchTermReplacementOrInputInProgress) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableSearchButtonInOmniboxForStrOrIip);
EXPECT_EQ(DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP,
GetDisplaySearchButtonConditions());
@@ -935,7 +935,7 @@
}
TEST_F(DisplaySearchButtonTest, CommandLineAlways) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableSearchButtonInOmniboxAlways);
EXPECT_EQ(DISPLAY_SEARCH_BUTTON_ALWAYS, GetDisplaySearchButtonConditions());
}
@@ -984,7 +984,7 @@
}
TEST_F(OriginChipTest, CommandLineDisabled) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableOriginChip);
EXPECT_FALSE(ShouldDisplayOriginChip());
EXPECT_EQ(ORIGIN_CHIP_DISABLED, GetOriginChipCondition());
@@ -997,14 +997,14 @@
}
TEST_F(OriginChipTest, CommandLineAlways) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableOriginChipAlways);
EXPECT_TRUE(ShouldDisplayOriginChip());
EXPECT_EQ(ORIGIN_CHIP_ALWAYS, GetOriginChipCondition());
}
TEST_F(OriginChipTest, CommandLineOnSrp) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableOriginChipOnSrp);
EXPECT_TRUE(ShouldDisplayOriginChip());
EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition());
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index 7d0fce3..eb934c8 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -118,7 +118,7 @@
class RealServiceProcessControlBrowserTest
: public ServiceProcessControlBrowserTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ServiceProcessControlBrowserTest::SetUpCommandLine(command_line);
base::FilePath exe;
PathService::Get(base::DIR_EXE, &exe);
diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.cc b/chrome/browser/services/gcm/gcm_desktop_utils.cc
index 83ee33c..a3259c2 100644
--- a/chrome/browser/services/gcm/gcm_desktop_utils.cc
+++ b/chrome/browser/services/gcm/gcm_desktop_utils.cc
@@ -75,8 +75,8 @@
}
std::string GetChannelStatusRequestUrl() {
- GURL sync_url(
- ProfileSyncService::GetSyncServiceURL(*CommandLine::ForCurrentProcess()));
+ GURL sync_url(ProfileSyncService::GetSyncServiceURL(
+ *base::CommandLine::ForCurrentProcess()));
return sync_url.spec() + kChannelStatusRelativePath;
}
diff --git a/chrome/browser/services/gcm/push_messaging_service_impl.cc b/chrome/browser/services/gcm/push_messaging_service_impl.cc
index 70977f9..59f6b6d 100644
--- a/chrome/browser/services/gcm/push_messaging_service_impl.cc
+++ b/chrome/browser/services/gcm/push_messaging_service_impl.cc
@@ -60,7 +60,7 @@
void PushMessagingServiceImpl::InitializeForProfile(Profile* profile) {
// TODO(mvanouwerkerk): Make sure to remove this check at the same time as
// push graduates from experimental in Blink.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableExperimentalWebPlatformFeatures)) {
return;
}
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index 294cce0..920fb2c 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -102,7 +102,7 @@
public:
FakeBackgroundModeManager()
: BackgroundModeManager(
- CommandLine::ForCurrentProcess(),
+ base::CommandLine::ForCurrentProcess(),
&g_browser_process->profile_manager()->GetProfileInfoCache()),
background_mode_active_(false) {}
diff --git a/chrome/browser/sessions/session_data_deleter.cc b/chrome/browser/sessions/session_data_deleter.cc
index fe610db..511c878 100644
--- a/chrome/browser/sessions/session_data_deleter.cc
+++ b/chrome/browser/sessions/session_data_deleter.cc
@@ -154,7 +154,7 @@
#else
SessionStartupPref::Type startup_pref_type =
StartupBrowserCreator::GetSessionStartupPref(
- *CommandLine::ForCurrentProcess(), profile).type;
+ *base::CommandLine::ForCurrentProcess(), profile).type;
#endif
scoped_refptr<SessionDataDeleter> deleter(
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 984be7b4..bcddac9 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -66,7 +66,7 @@
protected:
#if defined(OS_CHROMEOS)
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
// TODO(nkostylev): Investigate if we can remove this switch.
command_line->AppendSwitch(switches::kCreateBrowserOnStartupForTests);
InProcessBrowserTest::SetUpCommandLine(command_line);
@@ -982,14 +982,15 @@
RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
ui_test_utils::NavigateToURL(browser(), url1_);
// Launch an app.
- CommandLine app_launch_arguments = GetCommandLineForRelaunch();
+ base::CommandLine app_launch_arguments = GetCommandLineForRelaunch();
app_launch_arguments.AppendSwitchASCII(switches::kApp, url2_.spec());
ui_test_utils::BrowserAddedObserver window_observer;
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index d0d4017..845248c70 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -563,7 +563,7 @@
move_on_new_browser_ = false;
}
SessionStartupPref pref = StartupBrowserCreator::GetSessionStartupPref(
- *CommandLine::ForCurrentProcess(), profile());
+ *base::CommandLine::ForCurrentProcess(), profile());
if (pref.type == SessionStartupPref::LAST) {
SessionRestore::RestoreSession(
profile(), browser,
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 89ff2ed..46d7496 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -53,12 +53,12 @@
}
// static
-CommandLine ShellIntegration::CommandLineArgsForLauncher(
+base::CommandLine ShellIntegration::CommandLineArgsForLauncher(
const GURL& url,
const std::string& extension_app_id,
const base::FilePath& profile_path) {
base::ThreadRestrictions::AssertIOAllowed();
- CommandLine new_cmd_line(CommandLine::NO_PROGRAM);
+ base::CommandLine new_cmd_line(base::CommandLine::NO_PROGRAM);
AppendProfileArgs(
extension_app_id.empty() ? base::FilePath() : profile_path,
@@ -79,11 +79,10 @@
}
// static
-void ShellIntegration::AppendProfileArgs(
- const base::FilePath& profile_path,
- CommandLine* command_line) {
+void ShellIntegration::AppendProfileArgs(const base::FilePath& profile_path,
+ base::CommandLine* command_line) {
DCHECK(command_line);
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
// Use the same UserDataDir for new launches that we currently have set.
base::FilePath user_data_dir =
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index ef8f9b9..1ef2bd7 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -291,12 +291,12 @@
// file. Note: This should be used instead of GetCommandLineString, which does
// not properly quote the string; this function is designed for the Exec key.
std::string QuoteCommandLineForDesktopFileExec(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
// http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
std::string quoted_path = "";
- const CommandLine::StringVector& argv = command_line.argv();
- for (CommandLine::StringVector::const_iterator i = argv.begin();
+ const base::CommandLine::StringVector& argv = command_line.argv();
+ for (base::CommandLine::StringVector::const_iterator i = argv.begin();
i != argv.end(); ++i) {
if (i != argv.begin())
quoted_path += " ";
@@ -343,7 +343,7 @@
argv.push_back("which");
argv.push_back(script);
std::string path_version;
- if (base::GetAppOutput(CommandLine(argv), &path_version)) {
+ if (base::GetAppOutput(base::CommandLine(argv), &path_version)) {
// Remove trailing newline
path_version.erase(path_version.length() - 1, 1);
base::FilePath path_version_path(path_version);
@@ -421,11 +421,11 @@
std::string reply;
int success_code;
- bool ran_ok = base::GetAppOutputWithExitCode(CommandLine(argv), &reply,
+ bool ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), &reply,
&success_code);
if (ran_ok && success_code == EXIT_XDG_SETTINGS_SYNTAX_ERROR) {
if (GetChromeVersionOfScript(kXdgSettings, &argv[0])) {
- ran_ok = base::GetAppOutputWithExitCode(CommandLine(argv), &reply,
+ ran_ok = base::GetAppOutputWithExitCode(base::CommandLine(argv), &reply,
&success_code);
}
}
@@ -541,7 +541,7 @@
std::string browser;
// We don't care about the return value here.
- base::GetAppOutput(CommandLine(argv), &browser);
+ base::GetAppOutput(base::CommandLine(argv), &browser);
return browser.find("irefox") != std::string::npos;
}
@@ -587,9 +587,10 @@
}
std::string GetProgramClassName() {
- DCHECK(CommandLine::InitializedForCurrentProcess());
+ DCHECK(base::CommandLine::InitializedForCurrentProcess());
// Get the res_name component from argv[0].
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
std::string class_name = command_line->GetProgram().BaseName().value();
if (!class_name.empty())
class_name[0] = base::ToUpperASCII(class_name[0]);
@@ -768,15 +769,16 @@
const base::FilePath& profile_path,
const std::string& categories,
bool no_display) {
- CommandLine cmd_line = ShellIntegration::CommandLineArgsForLauncher(
- url, extension_id, profile_path);
+ base::CommandLine cmd_line =
+ ShellIntegration::CommandLineArgsForLauncher(url, extension_id,
+ profile_path);
cmd_line.SetProgram(chrome_exe_path);
return GetDesktopFileContentsForCommand(cmd_line, app_name, url, title,
icon_name, categories, no_display);
}
std::string GetDesktopFileContentsForCommand(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const std::string& app_name,
const GURL& url,
const base::string16& title,
@@ -1015,7 +1017,7 @@
icon_images.Add(*resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_256));
std::string icon_name = CreateShortcutIcon(icon_images, desktop_name);
- CommandLine command_line(chrome_exe_path);
+ base::CommandLine command_line(chrome_exe_path);
command_line.AppendSwitch(switches::kShowAppList);
std::string contents =
GetDesktopFileContentsForCommand(command_line,
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 8516cc37..1ab07a6 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -91,7 +91,7 @@
// Gets expected app id for given Chrome (based on |command_line| and
// |is_per_user_install|).
-base::string16 GetExpectedAppId(const CommandLine& command_line,
+base::string16 GetExpectedAppId(const base::CommandLine& command_line,
bool is_per_user_install) {
base::FilePath user_data_dir;
if (command_line.HasSwitch(switches::kUserDataDir))
@@ -461,8 +461,9 @@
chrome_exe != target_path) {
continue;
}
- CommandLine command_line(CommandLine::FromString(base::StringPrintf(
- L"\"%ls\" %ls", target_path.value().c_str(), arguments.c_str())));
+ base::CommandLine command_line(
+ base::CommandLine::FromString(base::StringPrintf(
+ L"\"%ls\" %ls", target_path.value().c_str(), arguments.c_str())));
// Get the expected AppId for this Chrome shortcut.
base::string16 expected_app_id(
diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc
index 5deecc5..021386d 100644
--- a/chrome/browser/signin/account_reconcilor_unittest.cc
+++ b/chrome/browser/signin/account_reconcilor_unittest.cc
@@ -130,7 +130,7 @@
// If it's a non-parameterized test, or we have a parameter of true, set flag.
if (!::testing::UnitTest::GetInstance()->current_test_info()->value_param() ||
GetParam()) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableNewProfileManagement);
}
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
index 927c333..bae9a04 100644
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -142,7 +142,7 @@
}
std::string ChromeSigninClient::GetSigninScopedDeviceId() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSigninScopedDeviceId)) {
return std::string();
}
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc
index d81c82ff..495b30c 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -85,7 +85,7 @@
// static
bool EasyUnlockService::IsSignInEnabled() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
+ return !base::CommandLine::ForCurrentProcess()->HasSwitch(
proximity_auth::switches::kDisableEasyUnlock);
}
@@ -261,7 +261,7 @@
if (shut_down_)
return false;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
proximity_auth::switches::kDisableEasyUnlock)) {
return false;
}
@@ -500,7 +500,7 @@
#if defined(OS_CHROMEOS)
// TODO(xiyuan): Remove this when the app is bundled with chrome.
if (!base::SysInfo::IsRunningOnChromeOS() &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
proximity_auth::switches::kForceLoadEasyUnlockAppInTests)) {
return;
}
@@ -514,7 +514,8 @@
#ifndef NDEBUG
// Only allow app path override switch for debug build.
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kEasyUnlockAppPath)) {
easy_unlock_path =
command_line->GetSwitchValuePath(switches::kEasyUnlockAppPath);
diff --git a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc b/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
index 0343793..b8e37c2 100644
--- a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
@@ -114,7 +114,7 @@
scoped_ptr<PowerManagerClient>(power_manager_client_));
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(
proximity_auth::switches::kForceLoadEasyUnlockAppInTests);
}
@@ -207,7 +207,7 @@
~EasyUnlockServiceDisabledTest() override {}
// InProcessBrowserTest:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(proximity_auth::switches::kDisableEasyUnlock);
}
diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc
index f37f31a..c06a083 100644
--- a/chrome/browser/signin/signin_browsertest.cc
+++ b/chrome/browser/signin/signin_browsertest.cc
@@ -36,7 +36,7 @@
class SigninBrowserTest : public InProcessBrowserTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
https_server_.reset(new net::SpawnedTestServer(
net::SpawnedTestServer::TYPE_HTTPS,
net::SpawnedTestServer::kLocalhost,
diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc
index e3aa0937..2f29236a 100644
--- a/chrome/browser/speech/tts_linux.cc
+++ b/chrome/browser/speech/tts_linux.cc
@@ -94,7 +94,8 @@
TtsPlatformImplLinux::TtsPlatformImplLinux()
: utterance_id_(0) {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kEnableSpeechDispatcher))
return;
diff --git a/chrome/browser/spellchecker/feedback_sender.cc b/chrome/browser/spellchecker/feedback_sender.cc
index af7677e..ab83a50 100644
--- a/chrome/browser/spellchecker/feedback_sender.cc
+++ b/chrome/browser/spellchecker/feedback_sender.cc
@@ -145,7 +145,7 @@
// TODO(rouslan): Remove the guard. http://crbug.com/247726
if (base::FieldTrialList::FindFullName(kFeedbackFieldTrialName) ==
kFeedbackFieldTrialEnabledGroupName &&
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableSpellingFeedbackFieldTrial)) {
return "v2-internal";
}
@@ -167,10 +167,10 @@
// The command-line switch is for testing and temporary.
// TODO(rouslan): Remove the command-line switch when testing is complete.
// http://crbug.com/247726
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSpellingServiceFeedbackUrl)) {
feedback_service_url_ =
- GURL(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ GURL(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kSpellingServiceFeedbackUrl));
}
}
@@ -314,11 +314,12 @@
// This command-line switch is for testing and temporary.
// TODO(rouslan): Remove the command-line switch when testing is complete.
// http://crbug.com/247726
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSpellingServiceFeedbackIntervalSeconds)) {
- base::StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kSpellingServiceFeedbackIntervalSeconds),
- &interval_seconds);
+ base::StringToInt(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kSpellingServiceFeedbackIntervalSeconds),
+ &interval_seconds);
if (interval_seconds < kMinIntervalSeconds)
interval_seconds = kMinIntervalSeconds;
static const int kSessionSeconds =
diff --git a/chrome/browser/spellchecker/feedback_sender_unittest.cc b/chrome/browser/spellchecker/feedback_sender_unittest.cc
index 6c278a9..5f6963d6 100644
--- a/chrome/browser/spellchecker/feedback_sender_unittest.cc
+++ b/chrome/browser/spellchecker/feedback_sender_unittest.cc
@@ -74,7 +74,7 @@
void AppendCommandLineSwitch() {
// The command-line switch is temporary.
// TODO(rouslan): Remove the command-line switch. http://crbug.com/247726
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableSpellingFeedbackFieldTrial);
feedback_.reset(new FeedbackSender(NULL, kLanguage, kCountry));
feedback_->StartFeedbackCollection();
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
index 577bb335..e179edb 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
@@ -79,10 +79,10 @@
int64 GetExpirationDelta() {
// Check command line flags first to give them priority, then check
// experimental groups.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kRememberCertErrorDecisions)) {
std::string switch_value =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kRememberCertErrorDecisions);
int64 expiration_delta;
if (!base::StringToInt64(base::StringPiece(switch_value),
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc
index 82e307c..35c84fab1 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate_test.cc
@@ -298,7 +298,7 @@
class IncognitoSSLHostStateDelegateTest
: public ChromeSSLHostStateDelegateTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeSSLHostStateDelegateTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kRememberCertErrorDecisions,
kDeltaSecondsString);
@@ -379,7 +379,7 @@
// won't be remembered over a restart.
class ForGetSSLHostStateDelegateTest : public ChromeSSLHostStateDelegateTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeSSLHostStateDelegateTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kRememberCertErrorDecisions,
kForgetAtSessionEnd);
@@ -425,7 +425,7 @@
class ForgetInstantlySSLHostStateDelegateTest
: public ChromeSSLHostStateDelegateTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeSSLHostStateDelegateTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kRememberCertErrorDecisions,
kForgetInstantly);
@@ -465,7 +465,7 @@
// specified.
class RememberSSLHostStateDelegateTest : public ChromeSSLHostStateDelegateTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ChromeSSLHostStateDelegateTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kRememberCertErrorDecisions,
kDeltaSecondsString);
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index c2925610..c19c31d 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -257,7 +257,7 @@
{ "/opt/bin/kcmshell4", "clock" },
};
- CommandLine command(base::FilePath(""));
+ base::CommandLine command(base::FilePath(""));
for (size_t i = 0; i < arraysize(kClockCommands); ++i) {
base::FilePath pathname(kClockCommands[i].pathname);
if (base::PathExists(pathname)) {
@@ -277,7 +277,7 @@
base::LaunchProcess(command, options);
#elif defined(OS_MACOSX)
- CommandLine command(base::FilePath("/usr/bin/open"));
+ base::CommandLine command(base::FilePath("/usr/bin/open"));
command.AppendArg("/System/Library/PreferencePanes/DateAndTime.prefPane");
base::LaunchOptions options;
@@ -289,7 +289,7 @@
PathService::Get(base::DIR_SYSTEM, &path);
static const base::char16 kControlPanelExe[] = L"control.exe";
path = path.Append(base::string16(kControlPanelExe));
- CommandLine command(path);
+ base::CommandLine command(path);
command.AppendArg(std::string("/name"));
command.AppendArg(std::string("Microsoft.DateAndTime"));
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index a73e9e1..ff88349e7 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -186,7 +186,7 @@
SSLOptions(SSLOptions::CERT_EXPIRED),
net::GetWebSocketTestDataDirectory()) {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Browser will both run and display insecure content.
command_line->AppendSwitch(switches::kAllowRunningInsecureContent);
// Use process-per-site so that navigating to a same-site page in a
@@ -364,7 +364,7 @@
SSLUITestBlock() : SSLUITest() {}
// Browser will neither run nor display insecure content.
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kNoDisplayingInsecureContent);
}
};
@@ -373,7 +373,7 @@
public:
SSLUITestIgnoreCertErrors() : SSLUITest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Browser will ignore certificate errors.
command_line->AppendSwitch(switches::kIgnoreCertificateErrors);
}
diff --git a/chrome/browser/supervised_user/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/permission_request_creator_apiary.cc
index e64a8b7..3624fa8f 100644
--- a/chrome/browser/supervised_user/permission_request_creator_apiary.cc
+++ b/chrome/browser/supervised_user/permission_request_creator_apiary.cc
@@ -105,10 +105,10 @@
}
GURL PermissionRequestCreatorApiary::GetApiUrl() const {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kPermissionRequestApiUrl)) {
- GURL url(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kPermissionRequestApiUrl));
+ GURL url(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kPermissionRequestApiUrl));
LOG_IF(WARNING, !url.is_valid())
<< "Got invalid URL for " << switches::kPermissionRequestApiUrl;
return url;
@@ -118,9 +118,9 @@
}
std::string PermissionRequestCreatorApiary::GetApiScope() const {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kPermissionRequestApiScope)) {
- return CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kPermissionRequestApiScope);
} else {
return kApiScope;
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index b890b455..8997176e 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -114,7 +114,7 @@
new base::FundamentalValue(SupervisedUserURLFilter::BLOCK)));
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Enable the test server and remap all URLs to it.
ASSERT_TRUE(test_server()->Start());
std::string host_port = test_server()->host_port_pair().ToString();
diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/supervised_user_registration_utility.cc
index 16de28f..07204a79 100644
--- a/chrome/browser/supervised_user/supervised_user_registration_utility.cc
+++ b/chrome/browser/supervised_user/supervised_user_registration_utility.cc
@@ -363,7 +363,7 @@
}
void SupervisedUserRegistrationUtilityImpl::CompleteRegistrationIfReady() {
- bool skip_check = CommandLine::ForCurrentProcess()->HasSwitch(
+ bool skip_check = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kNoSupervisedUserAcknowledgmentCheck);
if (!pending_supervised_user_acknowledged_ && !skip_check)
diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
index a6d9e61..30eae7c 100644
--- a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc
@@ -33,7 +33,7 @@
private:
void SetUpOnMainThread() override;
- void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
SupervisedUserService* supervised_user_service_;
};
@@ -44,7 +44,7 @@
}
void SupervisedUserResourceThrottleTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index c9be21a4..1a8c101d 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -747,7 +747,7 @@
SupervisedUserPrefMappingServiceFactory::GetForBrowserContext(profile_)
->Init();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kSupervisedUserSyncToken)) {
InitSync(
command_line->GetSwitchValueASCII(
@@ -833,17 +833,15 @@
UpdateSiteLists();
UpdateManualHosts();
UpdateManualURLs();
- bool use_blacklist =
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSupervisedUserBlacklist);
+ bool use_blacklist = base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableSupervisedUserBlacklist);
if (delegate_ && use_blacklist) {
base::FilePath blacklist_path = delegate_->GetBlacklistPath();
if (!blacklist_path.empty())
LoadBlacklist(blacklist_path, delegate_->GetBlacklistURL());
}
- bool use_safesites =
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSupervisedUserSafeSites);
+ bool use_safesites = base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableSupervisedUserSafeSites);
if (delegate_ && use_safesites) {
const std::string& cx = delegate_->GetSafeSitesCx();
if (!cx.empty()) {
diff --git a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
index 556aaac..7020fa9b 100644
--- a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
@@ -29,7 +29,7 @@
class SupervisedUserServiceTestSupervised : public InProcessBrowserTest {
public:
// content::BrowserTestBase:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
};
diff --git a/chrome/browser/sync/backup_rollback_controller.cc b/chrome/browser/sync/backup_rollback_controller.cc
index ab11277..fdef5cb 100644
--- a/chrome/browser/sync/backup_rollback_controller.cc
+++ b/chrome/browser/sync/backup_rollback_controller.cc
@@ -52,7 +52,7 @@
return false;
// Don't roll back if disabled or user is signed in.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDisableRollback) ||
!signin_->GetEffectiveUsername().empty()) {
sync_prefs_->SetRemainingRollbackTries(0);
@@ -86,9 +86,9 @@
const std::string group_name =
base::FieldTrialList::FindFullName(kSyncBackupFinchName);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDisableBackup) ||
- group_name == kSyncBackupFinchDisabled) {
+ group_name == kSyncBackupFinchDisabled) {
return false;
}
return true;
diff --git a/chrome/browser/sync/backup_rollback_controller_unittest.cc b/chrome/browser/sync/backup_rollback_controller_unittest.cc
index 483221c..9048077 100644
--- a/chrome/browser/sync/backup_rollback_controller_unittest.cc
+++ b/chrome/browser/sync/backup_rollback_controller_unittest.cc
@@ -87,8 +87,8 @@
}
TEST_F(BackupRollbackControllerTest, NoBackupIfDisabled) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSyncDisableBackup);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kSyncDisableBackup);
base::RunLoop run_loop;
EXPECT_FALSE(controller_->StartBackup());
@@ -130,8 +130,8 @@
TEST_F(BackupRollbackControllerTest, NoRollbackIfDisabled) {
fake_prefs_.SetRemainingRollbackTries(1);
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSyncDisableRollback);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kSyncDisableRollback);
EXPECT_FALSE(controller_->StartRollback());
EXPECT_EQ(0, fake_prefs_.GetRemainingRollbackTries());
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc
index 639fb10..4114a32f 100644
--- a/chrome/browser/sync/glue/sync_backend_host_impl.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc
@@ -135,7 +135,7 @@
InternalComponentsFactory::BACKOFF_NORMAL
};
- CommandLine* cl = CommandLine::ForCurrentProcess();
+ base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
if (cl->HasSwitch(switches::kSyncShortInitialRetryOverride)) {
factory_switches.backoff_override =
InternalComponentsFactory::BACKOFF_SHORT_INITIAL_RETRY_OVERRIDE;
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 2c469aca..2c0a90ac 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -134,7 +134,7 @@
namespace {
syncer::ModelTypeSet GetDisabledTypesFromCommandLine(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
syncer::ModelTypeSet disabled_types;
std::string disabled_types_str =
command_line.GetSwitchValueASCII(switches::kDisableSyncTypes);
@@ -143,7 +143,7 @@
}
syncer::ModelTypeSet GetEnabledTypesFromCommandLine(
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
syncer::ModelTypeSet enabled_types;
return enabled_types;
}
@@ -152,14 +152,15 @@
ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
Profile* profile,
- CommandLine* command_line,
+ base::CommandLine* command_line,
const GURL& sync_service_url,
OAuth2TokenService* token_service,
net::URLRequestContextGetter* url_request_context_getter)
: profile_(profile),
command_line_(command_line),
web_data_service_(WebDataServiceFactory::GetAutofillWebDataForProfile(
- profile_, Profile::EXPLICIT_ACCESS)),
+ profile_,
+ Profile::EXPLICIT_ACCESS)),
sync_service_url_(sync_service_url),
token_service_(token_service),
url_request_context_getter_(url_request_context_getter),
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
index a0337f2..2ee465a 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
@@ -34,7 +34,7 @@
void SetUp() override {
profile_.reset(new TestingProfile());
base::FilePath program_path(FILE_PATH_LITERAL("chrome.exe"));
- command_line_.reset(new CommandLine(program_path));
+ command_line_.reset(new base::CommandLine(program_path));
scope_set_.insert(GaiaConstants::kChromeSyncOAuth2Scope);
}
@@ -127,7 +127,7 @@
content::TestBrowserThreadBundle thread_bundle_;
scoped_ptr<Profile> profile_;
- scoped_ptr<CommandLine> command_line_;
+ scoped_ptr<base::CommandLine> command_line_;
OAuth2TokenService::ScopeSet scope_set_;
};
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index d11d9b9..b39380e3 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -217,7 +217,8 @@
factory_(factory.Pass()),
profile_(profile),
sync_prefs_(profile_->GetPrefs()),
- sync_service_url_(GetSyncServiceURL(*CommandLine::ForCurrentProcess())),
+ sync_service_url_(
+ GetSyncServiceURL(*base::CommandLine::ForCurrentProcess())),
is_first_time_sync_configure_(false),
backend_initialized_(false),
sync_disabled_by_admin_(false),
@@ -2467,7 +2468,8 @@
bool ProfileSyncService::IsSyncEnabled() {
// We have switches::kEnableSync just in case we need to change back to
// sync-disabled-by-default on a platform.
- return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync);
+ return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableSync);
}
bool ProfileSyncService::IsManaged() const {
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 0016b965..33bb0c6 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -107,8 +107,8 @@
// once http://crbug.com/171406 has been fixed.
AboutSigninInternalsFactory::GetForProfile(profile);
- const GURL sync_service_url =
- ProfileSyncService::GetSyncServiceURL(*CommandLine::ForCurrentProcess());
+ const GURL sync_service_url = ProfileSyncService::GetSyncServiceURL(
+ *base::CommandLine::ForCurrentProcess());
scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(
new SupervisedUserSigninManagerWrapper(profile, signin));
@@ -132,15 +132,9 @@
ProfileSyncService* pss = new ProfileSyncService(
scoped_ptr<ProfileSyncComponentsFactory>(
new ProfileSyncComponentsFactoryImpl(
- profile,
- CommandLine::ForCurrentProcess(),
- sync_service_url,
- token_service,
- url_request_context_getter)),
- profile,
- signin_wrapper.Pass(),
- token_service,
- behavior);
+ profile, base::CommandLine::ForCurrentProcess(), sync_service_url,
+ token_service, url_request_context_getter)),
+ profile, signin_wrapper.Pass(), token_service, behavior);
pss->factory()->RegisterDataTypes(pss);
pss->Initialize();
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 368dfcd0..566b369 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -176,7 +176,7 @@
~ProfileSyncServiceTest() override {}
void SetUp() override {
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kSyncDeferredStartupTimeoutSeconds, "0");
CHECK(profile_manager_.SetUp());
@@ -613,7 +613,7 @@
TEST_F(ProfileSyncServiceTest, GetSyncServiceURL) {
// See that we can override the URL with a flag.
- CommandLine command_line(
+ base::CommandLine command_line(
base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
EXPECT_EQ("https://foo/bar",
diff --git a/chrome/browser/sync/startup_controller.cc b/chrome/browser/sync/startup_controller.cc
index a609d86..d7f6ab0c 100644
--- a/chrome/browser/sync/startup_controller.cc
+++ b/chrome/browser/sync/startup_controller.cc
@@ -51,12 +51,13 @@
base::TimeDelta::FromSeconds(kDeferredInitFallbackSeconds)),
first_start_(true),
weak_factory_(this) {
-
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDeferredStartupTimeoutSeconds)) {
int timeout = kDeferredInitFallbackSeconds;
- if (base::StringToInt(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- switches::kSyncDeferredStartupTimeoutSeconds), &timeout)) {
+ if (base::StringToInt(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kSyncDeferredStartupTimeoutSeconds),
+ &timeout)) {
DCHECK_GE(timeout, 0);
DVLOG(2) << "Sync StartupController overriding startup timeout to "
<< timeout << " seconds.";
@@ -86,7 +87,7 @@
start_up_time_ = base::Time::Now();
if (deferred_option == STARTUP_BACKEND_DEFERRED &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDisableDeferredStartup) &&
sync_prefs_->GetPreferredDataTypes(registered_types_)
.Has(syncer::SESSIONS)) {
@@ -182,7 +183,7 @@
}
void StartupController::OnFallbackStartupTimerExpired() {
- DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
+ DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDisableDeferredStartup));
if (!start_backend_time_.is_null())
@@ -207,7 +208,7 @@
}
void StartupController::OnDataTypeRequestsSyncStartup(syncer::ModelType type) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSyncDisableDeferredStartup)) {
DVLOG(2) << "Ignoring data type request for sync startup: "
<< syncer::ModelTypeToString(type);
diff --git a/chrome/browser/sync/startup_controller_unittest.cc b/chrome/browser/sync/startup_controller_unittest.cc
index e8c6e1d9..186a759 100644
--- a/chrome/browser/sync/startup_controller_unittest.cc
+++ b/chrome/browser/sync/startup_controller_unittest.cc
@@ -113,8 +113,9 @@
controller()->TryStart();
EXPECT_FALSE(started());
token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
- const bool deferred_start = !CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kSyncDisableDeferredStartup);
+ const bool deferred_start =
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSyncDisableDeferredStartup);
controller()->TryStart();
EXPECT_EQ(!deferred_start, started());
std::string state(controller()->GetBackendInitializationStateString());
@@ -228,8 +229,9 @@
signin()->set_account(kTestUser);
token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
controller()->TryStart();
- const bool deferred_start = !CommandLine::ForCurrentProcess()->
- HasSwitch(switches::kSyncDisableDeferredStartup);
+ const bool deferred_start =
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSyncDisableDeferredStartup);
EXPECT_EQ(!deferred_start, started());
controller()->OnDataTypeRequestsSyncStartup(syncer::SESSIONS);
EXPECT_TRUE(started());
diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
index 4c9ed522..fcfda01 100644
--- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
@@ -33,7 +33,7 @@
~SingleClientAppListSyncTest() override {}
// SyncTest
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(app_list::switches::kEnableSyncAppList);
}
diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
index aa35013..881cc44 100644
--- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
@@ -41,13 +41,13 @@
~SingleClientBackupRollbackTest() override {}
void DisableBackup() {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSyncDisableBackup);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kSyncDisableBackup);
}
void DisableRollback() {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kSyncDisableRollback);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kSyncDisableRollback);
}
base::Time GetBackupDbLastModified() {
diff --git a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
index 681239c..8ddd680 100644
--- a/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc
@@ -25,7 +25,7 @@
~SingleClientSupervisedUserSettingsSyncTest() override {}
// SyncTest overrides:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
diff --git a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc
index 7dfb569..f8c68aa 100644
--- a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc
@@ -13,7 +13,7 @@
SingleClientWifiCredentialsSyncTest() : SyncTest(SINGLE_CLIENT) {}
~SingleClientWifiCredentialsSyncTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableWifiCredentialSync);
}
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index b8e86ad..7b66dc9 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -84,7 +84,7 @@
~TwoClientAppListSyncTest() override {}
// SyncTest
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(app_list::switches::kEnableSyncAppList);
}
@@ -520,7 +520,7 @@
TwoClientAppListSyncFolderTest() {}
~TwoClientAppListSyncFolderTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
TwoClientAppListSyncTest::SetUpCommandLine(command_line);
}
diff --git a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
index 59e9736..db17020 100644
--- a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc
@@ -13,7 +13,7 @@
TwoClientWifiCredentialsSyncTest() : SyncTest(TWO_CLIENT) {}
~TwoClientWifiCredentialsSyncTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
SyncTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableWifiCredentialSync);
}
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 3f85313..22cd926e 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -259,7 +259,7 @@
// TODO(peria): Move the migration code (from v3 to v4) here.
return SYNC_STATUS_OK;
case 4:
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
kDisableMetadataDatabaseOnDisk)) {
MigrateDatabaseFromV4ToV3(db->GetLevelDB());
}
@@ -521,8 +521,9 @@
const base::FilePath& database_path,
leveldb::Env* env_override,
SyncStatusCode* status_out) {
- bool enable_on_disk_index = !CommandLine::ForCurrentProcess()->HasSwitch(
- kDisableMetadataDatabaseOnDisk);
+ bool enable_on_disk_index =
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ kDisableMetadataDatabaseOnDisk);
return CreateInternal(database_path, env_override, enable_on_disk_index,
status_out);
}
diff --git a/chrome/browser/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc
index d2cbac4..dba2c37 100644
--- a/chrome/browser/task_manager/browser_process_resource_provider.cc
+++ b/chrome/browser/task_manager/browser_process_resource_provider.cc
@@ -129,7 +129,8 @@
// BrowserProcess uses v8 for proxy resolver in certain cases.
bool BrowserProcessResource::ReportsV8MemoryStats() const {
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
bool using_v8 = !command_line->HasSwitch(switches::kWinHttpProxyResolver);
if (using_v8 && command_line->HasSwitch(switches::kSingleProcess)) {
using_v8 = false;
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 25dc0ecd..1d5d69c 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -113,7 +113,7 @@
}
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
// Do not launch device discovery process.
@@ -132,14 +132,14 @@
TaskManagerOOPIFBrowserTest() {}
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
TaskManagerBrowserTest::SetUpCommandLine(command_line);
if (GetParam())
command_line->AppendSwitch(switches::kSitePerProcess);
}
bool ShouldExpectSubframes() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSitePerProcess);
}
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 49abbb0..ca607be 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -163,7 +163,7 @@
}
void SetUpExtension() {
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
extensions::TestExtensionSystem* test_ext_system =
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get()));
diff --git a/chrome/browser/thumbnails/thumbnail_service_impl.cc b/chrome/browser/thumbnails/thumbnail_service_impl.cc
index 8f572d39..9a8f2bef 100644
--- a/chrome/browser/thumbnails/thumbnail_service_impl.cc
+++ b/chrome/browser/thumbnails/thumbnail_service_impl.cc
@@ -29,7 +29,7 @@
if (!chrome::IsInstantExtendedAPIEnabled())
return false;
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableThumbnailRetargeting);
}
diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc
index b8cb3d10..16860e7 100644
--- a/chrome/browser/translate/translate_browsertest.cc
+++ b/chrome/browser/translate/translate_browsertest.cc
@@ -54,7 +54,7 @@
base::FilePath(kTranslateRoot)),
infobar_service_(NULL) {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ASSERT_TRUE(https_server_.Start());
// Setup alternate security origin for testing in order to allow XHR against
// local test server. Note that this flag shows a confirm infobar in tests.
diff --git a/chrome/browser/translate/translate_service.cc b/chrome/browser/translate/translate_service.cc
index bf8226fa..03ac7a71 100644
--- a/chrome/browser/translate/translate_service.cc
+++ b/chrome/browser/translate/translate_service.cc
@@ -96,7 +96,7 @@
return true;
#elif defined(OS_MACOSX)
// The bubble UX is experimental on Mac OS X.
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableTranslateNewUX);
#else
// The bubble UX is not implemented on other platforms.
diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
index 22e8e86..9c1484cc 100644
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -30,7 +30,7 @@
PROFILE_LOADED_NONE,
};
-base::Time GetOriginalProcessStartTime(const CommandLine& command_line) {
+base::Time GetOriginalProcessStartTime(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
std::string start_time_string =
command_line.GetSwitchValueASCII(switches::kOriginalProcessStartTime);
@@ -48,7 +48,7 @@
#endif
}
-StartupType GetStartupType(const CommandLine& command_line) {
+StartupType GetStartupType(const base::CommandLine& command_line) {
// The presence of kOriginalProcessStartTime implies that another process
// has sent us its command line to handle, ie: we are already running.
if (command_line.HasSwitch(switches::kOriginalProcessStartTime)) {
@@ -97,7 +97,7 @@
}
void RecordStartupInfo(AppListService* service,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
Profile* launch_profile) {
base::Time start_time = GetOriginalProcessStartTime(command_line);
if (start_time.is_null())
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.cc b/chrome/browser/ui/app_list/app_list_service_impl.cc
index 90fa142..5e83b95 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl.cc
@@ -229,14 +229,14 @@
AppListServiceImpl::AppListServiceImpl()
: profile_store_(
new ProfileStoreImpl(g_browser_process->profile_manager())),
- command_line_(*CommandLine::ForCurrentProcess()),
+ command_line_(*base::CommandLine::ForCurrentProcess()),
local_state_(g_browser_process->local_state()),
profile_loader_(new ProfileLoader(profile_store_.get())),
weak_factory_(this) {
profile_store_->AddProfileObserver(this);
}
-AppListServiceImpl::AppListServiceImpl(const CommandLine& command_line,
+AppListServiceImpl::AppListServiceImpl(const base::CommandLine& command_line,
PrefService* local_state,
scoped_ptr<ProfileStore> profile_store)
: profile_store_(profile_store.Pass()),
diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
index 2dc50e0..f8690d7 100644
--- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
@@ -145,7 +145,7 @@
public:
ShowAppListInteractiveTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kShowAppList);
}
@@ -178,7 +178,7 @@
// With Chrome still running, test receiving a second --show-app-list request
// via the process singleton. ChromeOS has no process singleton so exclude it.
#if !defined(OS_CHROMEOS)
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kShowAppList);
StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
command_line, base::FilePath(), profile->GetPath());
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 2b262ac..bb48612 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -371,7 +371,7 @@
// OnShimLaunch(). Note that if --silent-launch is not also passed, the window
// will instead populate via StartupBrowserCreator::Launch(). Shim-initiated
// launches will always have --silent-launch.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowAppList))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowAppList))
ShowWindowNearDock();
}
diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc
index eca8b1d..7b342d0d 100644
--- a/chrome/browser/ui/app_list/app_list_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc
@@ -22,7 +22,7 @@
class TestingAppListServiceImpl : public AppListServiceImpl {
public:
- TestingAppListServiceImpl(const CommandLine& command_line,
+ TestingAppListServiceImpl(const base::CommandLine& command_line,
PrefService* local_state,
scoped_ptr<ProfileStore> profile_store)
: AppListServiceImpl(command_line, local_state, profile_store.Pass()),
@@ -80,11 +80,11 @@
AppListServiceUnitTest() {}
void SetUp() override {
- SetupWithCommandLine(CommandLine(CommandLine::NO_PROGRAM));
+ SetupWithCommandLine(base::CommandLine(base::CommandLine::NO_PROGRAM));
}
protected:
- void SetupWithCommandLine(const CommandLine& command_line) {
+ void SetupWithCommandLine(const base::CommandLine& command_line) {
user_data_dir_ = base::FilePath(FILE_PATH_LITERAL("udd"));
profile1_.reset(
new FakeProfile("p1", user_data_dir_.AppendASCII("profile1")));
@@ -177,7 +177,7 @@
}
TEST_F(AppListServiceUnitTest, EnableViaCommandLineFlag) {
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kEnableAppList);
SetupWithCommandLine(command_line);
service_->PerformStartupChecks(profile1_.get());
@@ -185,7 +185,7 @@
}
TEST_F(AppListServiceUnitTest, DisableViaCommandLineFlag) {
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitch(switches::kResetAppListInstallState);
SetupWithCommandLine(command_line);
service_->PerformStartupChecks(profile1_.get());
diff --git a/chrome/browser/ui/app_list/search/search_controller_factory.cc b/chrome/browser/ui/app_list/search/search_controller_factory.cc
index 9e85234..b1746c00 100644
--- a/chrome/browser/ui/app_list/search/search_controller_factory.cc
+++ b/chrome/browser/ui/app_list/search/search_controller_factory.cc
@@ -55,8 +55,8 @@
controller->AddProvider(Mixer::WEBSTORE_GROUP,
scoped_ptr<SearchProvider>(
new WebstoreProvider(profile, list_controller)));
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisablePeopleSearch)) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePeopleSearch)) {
controller->AddProvider(Mixer::PEOPLE_GROUP,
scoped_ptr<SearchProvider>(
new PeopleProvider(profile, list_controller)));
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
index 3652faa..64f8b20 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
@@ -108,9 +108,9 @@
test_server_->RegisterRequestHandler(
base::Bind(&WebstoreProviderTest::HandleRequest,
base::Unretained(this)));
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
::switches::kAppsGalleryURL, test_server_->base_url().spec());
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalAppList);
webstore_provider_.reset(new WebstoreProvider(
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index a9caa84d..5d33194 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -62,7 +62,8 @@
IN_PROC_BROWSER_TEST_F(AcceleratorCommandsBrowserTest, ToggleMaximized) {
#if defined(OS_WIN)
// Run the test on Win Ash only.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -128,7 +129,8 @@
ToggleFullscreen) {
#if defined(OS_WIN)
// Run the test on Win Ash only.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -266,7 +268,8 @@
ToggleFullscreen) {
#if defined(OS_WIN)
// Run the test on Win Ash only.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 6b0542a..49dba9d 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -84,8 +84,8 @@
shell->partial_magnification_controller()->
SetEnabled(magnifier_enabled && magnifier_type == ui::MAGNIFIER_PARTIAL);
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableZeroBrowsersOpenForTests)) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableZeroBrowsersOpenForTests)) {
chrome::IncrementKeepAliveCount();
}
#endif
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index 8216b45..5608e82 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -21,7 +21,7 @@
return true;
#else
// TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
#endif
}
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 80b714b..929ae63 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -223,7 +223,7 @@
} // anonymous namespace
bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kFirstExecAfterBoot);
}
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index 38b1343..5e0703c 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -191,8 +191,8 @@
// If we are launched to service a windows 8 search request then let the
// IPC which carries the search string create the browser and initiate
// the navigation.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kWindows8Search))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kWindows8Search))
break;
#endif
// If Chrome ASH is launched when no browser is open in the desktop,
@@ -206,7 +206,7 @@
// silent-mode by the metro viewer process, which causes the
// StartupBrowserCreatorImpl class to not create any browsers which is
// not the behavior we want.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl startup_impl(
base::FilePath(),
dummy,
diff --git a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
index 074f379..89cc9ce 100644
--- a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
@@ -29,7 +29,7 @@
}
// Ensure that the virtual keyboard is enabled.
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(
keyboard::switches::kEnableVirtualKeyboard);
}
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 1ec9441..002b6d0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -1101,7 +1101,7 @@
}
if (window->IsActive() && allow_minimize) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableMinimizeOnSecondLauncherItemClick)) {
AnimateWindow(window->GetNativeWindow(),
wm::WINDOW_ANIMATION_TYPE_BOUNCE);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index f95eacab..43df3cf 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -342,7 +342,7 @@
ShelfAppBrowserTestNoDefaultBrowser() {}
virtual ~ShelfAppBrowserTestNoDefaultBrowser() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
ShelfAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kNoStartupWindow);
}
@@ -359,7 +359,7 @@
ShelfAppBrowserNoMinimizeOnClick() {}
virtual ~ShelfAppBrowserNoMinimizeOnClick() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
LauncherPlatformAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(
switches::kDisableMinimizeOnSecondLauncherItemClick);
@@ -804,7 +804,7 @@
// Confirm that click behavior for app panels is correct.
IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, AppPanelClickBehavior) {
// Enable experimental APIs to allow panel creation.
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
extensions::switches::kEnableExperimentalExtensionApis);
// Launch a platform app and create a panel window for it.
const Extension* extension1 = LoadAndLaunchPlatformApp("launch", "Launched");
@@ -859,7 +859,7 @@
TestAppWindowRegistryObserver test_observer(browser()->profile());
// Enable experimental APIs to allow panel creation.
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
extensions::switches::kEnableExperimentalExtensionApis);
int base_shelf_item_count = shelf_model()->item_count();
@@ -1765,7 +1765,7 @@
ShelfAppBrowserTestWithMultiMonitor() {}
virtual ~ShelfAppBrowserTestWithMultiMonitor() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
ShelfAppBrowserTestNoDefaultBrowser::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII("ash-host-window-bounds",
"800x800,801+0-800x800");
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 819461e..b4674b3 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -288,7 +288,7 @@
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile())));
extension_service_ = extension_system->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
std::string error;
extension1_ = Extension::Create(base::FilePath(), Manifest::UNPACKED,
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
index dafd51223..9b1edd27 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -140,8 +140,8 @@
}
bool SessionStateDelegateChromeos::IsUserSessionBlocked() const {
- bool has_login_manager = CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kLoginManager);
+ bool has_login_manager = base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kLoginManager);
return (has_login_manager && !IsActiveUserSessionStarted()) ||
IsScreenLocked() ||
chromeos::UserAddingScreen::Get()->IsRunning();
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
index 82186b2..2f41b9e 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
@@ -239,7 +239,7 @@
VolumeControllerSoundsDisabledTest() {}
virtual ~VolumeControllerSoundsDisabledTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
VolumeControllerSoundsTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(chromeos::switches::kDisableVolumeAdjustSound);
}
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.cc b/chrome/browser/ui/ash/volume_controller_chromeos.cc
index 554844f..da8df85 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_chromeos.cc
@@ -24,7 +24,7 @@
const double kStepPercentage = 4.0;
bool VolumeAdjustSoundEnabled() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
+ return !base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kDisableVolumeAdjustSound);
}
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
index b878bd14..be88def 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
@@ -63,13 +63,15 @@
// Returns the desktop this process was initially launched in.
chrome::HostDesktopType GetInitialDesktop() {
#if defined(OS_WIN) && defined(USE_ASH)
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kViewerConnect) ||
command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
return chrome::HOST_DESKTOP_TYPE_ASH;
}
#elif defined(OS_LINUX)
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kOpenAsh))
return chrome::HOST_DESKTOP_TYPE_ASH;
#endif
@@ -145,7 +147,8 @@
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
if (getuid() == 0) {
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kUserDataDir))
return;
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index 80a0d99..ba53909f 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -280,7 +280,7 @@
AutofillDialogControllerTest() : controller_(NULL) {}
virtual ~AutofillDialogControllerTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(::switches::kReduceSecurityForTesting);
}
@@ -1474,7 +1474,7 @@
AutofillDialogControllerSecurityTest() {}
~AutofillDialogControllerSecurityTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
CHECK(!command_line->HasSwitch(::switches::kReduceSecurityForTesting));
}
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index 1d20ffe..7fcf1ca 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -2528,7 +2528,7 @@
controller()->OnDidGetWalletItems(
wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
ASSERT_EQ(
"",
command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
@@ -2543,7 +2543,7 @@
controller()->OnDidGetWalletItems(
wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
ASSERT_EQ(
"",
command_line->GetSwitchValueASCII(switches::kWalletServiceUseSandbox));
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index 687f3e14..5aa4db7 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -266,7 +266,8 @@
BlockWebContentsCreation) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -281,7 +282,8 @@
BlockWebContentsCreationIncognito) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -296,7 +298,8 @@
PopupBlockedFakeClickOnAnchor) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -311,7 +314,8 @@
PopupBlockedFakeClickOnAnchorNoTarget) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -381,7 +385,7 @@
IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
PopupsLaunchWhenTabIsClosed) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
GURL url(
embedded_test_server()->GetURL("/popup_blocker/popup-on-unload.html"));
@@ -394,7 +398,7 @@
// Verify that when you unblock popup, the popup shows in history and omnibox.
IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
UnblockedPopupShowsInHistoryAndOmnibox) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
GURL url(embedded_test_server()->GetURL(
"/popup_blocker/popup-blocked-to-post-blank.html"));
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
index a370213..233bf8a2 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
@@ -50,7 +50,7 @@
void BookmarkBubbleSignInDelegateTest::SetUp() {
BrowserWithTestWindowTest::SetUp();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
// Force web-based signin, otherwise tests will crash because inline signin
// involves IO thread operation.
// TODO(guohui): fix the test for inline signin.
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
index 3e3fb55..d26aca4ac 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
@@ -92,8 +92,8 @@
AddSeparator();
AddItem(IDC_BOOKMARK_BAR_REMOVE, IDS_BOOKMARK_BAR_REMOVE);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableBookmarkUndo)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableBookmarkUndo)) {
AddItem(IDC_BOOKMARK_BAR_UNDO, IDS_BOOKMARK_BAR_UNDO);
AddItem(IDC_BOOKMARK_BAR_REDO, IDS_BOOKMARK_BAR_REDO);
}
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 9d0877b..af09a0c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -244,13 +244,13 @@
// Is the fast tab unload experiment enabled?
bool IsFastTabUnloadEnabled() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableFastUnload);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableFastUnload);
}
bool IsWebAppFrameEnabled() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebAppFrame);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebAppFrame);
}
} // namespace
@@ -1151,8 +1151,9 @@
if (!allow_overscroll)
return false;
- const std::string value = CommandLine::ForCurrentProcess()->
- GetSwitchValueASCII(switches::kOverscrollHistoryNavigation);
+ const std::string value =
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kOverscrollHistoryNavigation);
bool overscroll_enabled = value != "0";
if (!overscroll_enabled)
return false;
@@ -1354,8 +1355,9 @@
params.disposition == NEW_FOREGROUND_TAB ||
params.disposition == NEW_BACKGROUND_TAB ||
params.disposition == NEW_WINDOW) &&
- !params.user_gesture && !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisablePopupBlocking)) {
+ !params.user_gesture &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePopupBlocking)) {
if (popup_blocker_helper->MaybeBlockPopup(nav_params,
WebWindowFeatures())) {
return NULL;
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index b9e9926c..93cb13f 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -356,7 +356,8 @@
IN_PROC_BROWSER_TEST_F(BrowserTest, NoTitle) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -376,7 +377,8 @@
IN_PROC_BROWSER_TEST_F(BrowserTest, Title) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -898,7 +900,7 @@
// it to a cross-site URL. It should also work for meta-refreshes.
// See http://crbug.com/93517.
IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
// Create http and https servers for a cross-site transition.
@@ -987,7 +989,7 @@
// http://www.google.com/chrome/intl/en/webmasters-faq.html#newtab will not
// fork a new renderer process.
IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
// Create http and https servers for a cross-site transition.
@@ -1307,7 +1309,7 @@
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
const Extension* extension_app = GetExtension();
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
@@ -1541,7 +1543,7 @@
PinnedTabCodec::WritePinnedTabs(browser()->profile());
// Simulate launching again.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
@@ -2141,7 +2143,7 @@
#endif
IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
GURL url = ui_test_utils::GetTestUrl(
base::FilePath(), base::FilePath().AppendASCII("window.close.html"));
@@ -2160,7 +2162,8 @@
IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenBookmarkBar) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -2197,7 +2200,7 @@
public:
KioskModeTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kKioskMode);
}
};
@@ -2222,7 +2225,7 @@
public:
LaunchBrowserWithNonAsciiUserDatadir() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine");
@@ -2247,7 +2250,7 @@
public:
RunInBackgroundTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kKeepAliveForTest);
}
};
@@ -2277,7 +2280,7 @@
public:
NoStartupWindowTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kNoStartupWindow);
command_line->AppendSwitch(switches::kKeepAliveForTest);
}
@@ -2293,7 +2296,8 @@
IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, NoStartupWindowBasicTest) {
#if defined(OS_WIN) && defined(USE_ASH)
// kNoStartupWindow doesn't make sense in Metro+Ash.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -2314,7 +2318,8 @@
IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, DontInitSessionServiceForApps) {
#if defined(OS_WIN) && defined(USE_ASH)
// kNoStartupWindow doesn't make sense in Metro+Ash.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -2340,7 +2345,7 @@
public:
AppModeTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
GURL url = ui_test_utils::GetTestUrl(
base::FilePath(), base::FilePath().AppendASCII("title1.html"));
command_line->AppendSwitchASCII(switches::kApp, url.spec());
@@ -2350,7 +2355,8 @@
IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index d1e5f5f..b0ce210 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1015,9 +1015,8 @@
// Distill current page.
command_updater_.UpdateCommandEnabled(
- IDC_DISTILL_PAGE,
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableDomDistiller));
+ IDC_DISTILL_PAGE, base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableDomDistiller));
// Initialize other commands whose state changes based on various conditions.
UpdateCommandsForFullscreenMode();
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index 6204b0b..c70f6647 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -176,7 +176,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::DisableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
ASSERT_FALSE(switches::IsNewAvatarMenu());
TestingProfileManager testing_profile_manager(
@@ -213,7 +214,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
TestingProfileManager testing_profile_manager(
TestingBrowserProcess::GetGlobal());
@@ -239,7 +241,8 @@
return;
// The command line is reset at the end of every test by the test suite.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
TestingProfileManager testing_profile_manager(
TestingBrowserProcess::GetGlobal());
@@ -292,9 +295,11 @@
// Both the old style and the new style avatar menu should be disabled.
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
if (switches::IsNewAvatarMenu()) {
- switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::DisableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
} else {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
}
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
// The command line is reset at the end of every test by the test suite.
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 244d4593..06dd6f8 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -321,9 +321,9 @@
incognito = false;
}
} else if (profile->IsGuestSession() ||
- (browser_defaults::kAlwaysOpenIncognitoWindow &&
- IncognitoModePrefs::ShouldLaunchIncognito(
- *CommandLine::ForCurrentProcess(), prefs))) {
+ (browser_defaults::kAlwaysOpenIncognitoWindow &&
+ IncognitoModePrefs::ShouldLaunchIncognito(
+ *base::CommandLine::ForCurrentProcess(), prefs))) {
incognito = true;
}
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index 87ed503..80f7a17 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -153,8 +153,8 @@
// Subclass that tests navigation while in the Guest session.
class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
protected:
- virtual void SetUpCommandLine(CommandLine* command_line) override {
- CommandLine command_line_copy = *command_line;
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ base::CommandLine command_line_copy = *command_line;
command_line_copy.AppendSwitchASCII(
chromeos::switches::kLoginProfile, "user");
command_line_copy.AppendSwitch(chromeos::switches::kGuestSession);
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
index 58e5999..3fcd438 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -121,7 +121,7 @@
bool BrowserTabStripModelDelegate::RunUnloadListenerBeforeClosing(
content::WebContents* contents) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableFastUnload)) {
return chrome::FastUnloadController::RunUnloadEventsHelper(contents);
}
@@ -130,7 +130,7 @@
bool BrowserTabStripModelDelegate::ShouldRunUnloadListenerBeforeClosing(
content::WebContents* contents) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableFastUnload)) {
return chrome::FastUnloadController::ShouldRunUnloadEventsHelper(contents);
}
diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc
index 79d0a9d5..f31e5ec 100644
--- a/chrome/browser/ui/browser_window_state.cc
+++ b/chrome/browser/ui/browser_window_state.cc
@@ -138,7 +138,8 @@
bounds,
show_state);
- const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& parsed_command_line =
+ *base::CommandLine::ForCurrentProcess();
bool record_mode = parsed_command_line.HasSwitch(switches::kRecordMode);
bool playback_mode = parsed_command_line.HasSwitch(switches::kPlaybackMode);
if (record_mode || playback_mode) {
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 0fc4b043..b198f81 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -33,7 +33,7 @@
virtual ~AppShimMenuControllerBrowserTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
PlatformAppBrowserTest::SetUpCommandLine(command_line);
}
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
index f48afaa..8054c27 100644
--- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
+++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
@@ -48,8 +48,9 @@
: notification_profile_(NULL), suppress_for_session_(false) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- hosted_app_quit_notification_ = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kHostedAppQuitNotification);
+ hosted_app_quit_notification_ =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kHostedAppQuitNotification);
// There is only ever one notification to replace, so use the same replace_id
// each time.
@@ -124,8 +125,8 @@
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// Quit immediately if this is a test.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAppsKeepChromeAliveInTests)) {
return true;
}
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
index ae691a7c..df410a1 100644
--- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
+++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
@@ -34,7 +34,7 @@
virtual ~QuitWithAppsControllerInteractiveTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
PlatformAppBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kAppsKeepChromeAliveInTests);
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 821cdee..6d36ca6 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -290,10 +290,9 @@
base::FilePath extension_dir;
static_cast<extensions::TestExtensionSystem*>(
- extensions::ExtensionSystem::Get(profile()))->
- CreateExtensionService(
- CommandLine::ForCurrentProcess(),
- extension_dir, false);
+ extensions::ExtensionSystem::Get(profile()))
+ ->CreateExtensionService(base::CommandLine::ForCurrentProcess(),
+ extension_dir, false);
resizeDelegate_.reset([[ViewResizerPong alloc] init]);
NSRect parent_frame = NSMakeRect(0, 0, 800, 50);
parent_view_.reset([[NSView alloc] initWithFrame:parent_frame]);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
index 4161442..67f59129 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller_unittest.mm
@@ -25,8 +25,9 @@
ASSERT_TRUE(profile());
// Adds TestExtensionSystem, since signin uses the gaia auth extension.
static_cast<extensions::TestExtensionSystem*>(
- extensions::ExtensionSystem::Get(profile()))->CreateExtensionService(
- CommandLine::ForCurrentProcess(), base::FilePath(), false);
+ extensions::ExtensionSystem::Get(profile()))
+ ->CreateExtensionService(base::CommandLine::ForCurrentProcess(),
+ base::FilePath(), false);
}
};
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 52e4c42..21b052e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -587,7 +587,8 @@
[self saveWindowPositionIfNeeded];
bool fast_tab_closing_enabled =
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableFastUnload);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableFastUnload);
if (!browser_->tab_strip_model()->empty()) {
// Tab strip isn't empty. Hide the frame (so it appears to have closed
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 38acf8d..7fc8ac0 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -437,7 +437,7 @@
BOOL fullscreen_for_tab =
browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending();
BOOL kiosk_mode =
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
BOOL showDropdown =
!fullscreen_for_tab && !kiosk_mode && ([self floatingBarHasFocus]);
if (permissionBubbleCocoa_ && permissionBubbleCocoa_->IsVisible()) {
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
index 0d461ca..c7fc032d 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
@@ -55,7 +55,7 @@
ASSERT_TRUE(browser());
window_ = browser()->window()->GetNativeWindow();
icon_ = LoadTestIcon();
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
extension_service_ = static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile()))->CreateExtensionService(
&command_line, base::FilePath(), false);
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
index 93864c0e0..5e3364e 100644
--- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
+++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -160,7 +160,7 @@
// don't want to be nagged about the default browser also don't want to be
// nagged about the update check. (Automated testers, I'm thinking of
// you...)
- CommandLine* commandLine = CommandLine::ForCurrentProcess();
+ base::CommandLine* commandLine = base::CommandLine::ForCurrentProcess();
if (first_run::IsChromeFirstRun() ||
!profile->GetPrefs()->GetBoolean(prefs::kShowUpdatePromotionInfoBar) ||
commandLine->HasSwitch(switches::kNoDefaultBrowserCheck)) {
diff --git a/chrome/browser/ui/cocoa/presentation_mode_controller.mm b/chrome/browser/ui/cocoa/presentation_mode_controller.mm
index a80ceb1..3050092b 100644
--- a/chrome/browser/ui/cocoa/presentation_mode_controller.mm
+++ b/chrome/browser/ui/cocoa/presentation_mode_controller.mm
@@ -334,7 +334,7 @@
if (!inPresentationMode_)
return;
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
return;
if (self.slidingStyle == fullscreen_mac::OMNIBOX_TABS_PRESENT)
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
index 185269d9..eed1e96 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
@@ -32,7 +32,8 @@
class AvatarButtonControllerTest : public CocoaProfileTest {
public:
virtual void SetUp() override {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
DCHECK(profiles::IsMultipleProfilesEnabled());
CocoaProfileTest::SetUp();
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index 614dcd2..317df7a 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -91,7 +91,7 @@
}
void EnableFastUserSwitching() {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kFastUserSwitching);
}
@@ -108,7 +108,8 @@
};
TEST_F(ProfileChooserControllerTest, InitialLayoutWithNewMenu) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
StartProfileChooserController();
NSArray* subviews = [[[controller() window] contentView] subviews];
@@ -174,7 +175,8 @@
}
TEST_F(ProfileChooserControllerTest, InitialLayoutWithFastUserSwitcher) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
EnableFastUserSwitching();
StartProfileChooserController();
@@ -237,7 +239,8 @@
}
TEST_F(ProfileChooserControllerTest, OtherProfilesSortedAlphabetically) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
EnableFastUserSwitching();
// Add two extra profiles, to make sure sorting is alphabetical and not
@@ -282,7 +285,8 @@
TEST_F(ProfileChooserControllerTest,
LocalProfileActiveCardLinksWithNewMenu) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
StartProfileChooserController();
NSArray* subviews = [[[controller() window] contentView] subviews];
ASSERT_EQ(2U, [subviews count]);
@@ -307,7 +311,7 @@
TEST_F(ProfileChooserControllerTest,
SignedInProfileActiveCardLinksWithAccountConsistency) {
switches::EnableAccountConsistencyForTesting(
- CommandLine::ForCurrentProcess());
+ base::CommandLine::ForCurrentProcess());
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
@@ -329,7 +333,8 @@
TEST_F(ProfileChooserControllerTest,
SignedInProfileActiveCardLinksWithNewMenu) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
@@ -352,7 +357,7 @@
TEST_F(ProfileChooserControllerTest, AccountManagementLayout) {
switches::EnableAccountConsistencyForTesting(
- CommandLine::ForCurrentProcess());
+ base::CommandLine::ForCurrentProcess());
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
@@ -466,7 +471,7 @@
TEST_F(ProfileChooserControllerTest, SignedInProfileLockDisabled) {
switches::EnableNewProfileManagementForTesting(
- CommandLine::ForCurrentProcess());
+ base::CommandLine::ForCurrentProcess());
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
@@ -492,7 +497,7 @@
TEST_F(ProfileChooserControllerTest, SignedInProfileLockEnabled) {
switches::EnableNewProfileManagementForTesting(
- CommandLine::ForCurrentProcess());
+ base::CommandLine::ForCurrentProcess());
// Sign in the first profile.
ProfileInfoCache* cache = testing_profile_manager()->profile_info_cache();
cache->SetUserNameOfProfileAtIndex(0, base::ASCIIToUTF16(kEmail));
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
index 04dd3650..3401079fbe 100644
--- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -28,7 +28,7 @@
class ViewIDTest : public InProcessBrowserTest {
public:
ViewIDTest() : root_window_(nil) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
extensions::switches::kEnableExperimentalExtensionApis);
}
diff --git a/chrome/browser/ui/extensions/app_launch_params.cc b/chrome/browser/ui/extensions/app_launch_params.cc
index 883ce47..80dab73 100644
--- a/chrome/browser/ui/extensions/app_launch_params.cc
+++ b/chrome/browser/ui/extensions/app_launch_params.cc
@@ -25,7 +25,7 @@
desktop_type(chrome::GetActiveDesktop()),
override_url(),
override_bounds(),
- command_line(CommandLine::NO_PROGRAM),
+ command_line(base::CommandLine::NO_PROGRAM),
source(source) {
}
@@ -40,7 +40,7 @@
desktop_type(chrome::GetActiveDesktop()),
override_url(),
override_bounds(),
- command_line(CommandLine::NO_PROGRAM),
+ command_line(base::CommandLine::NO_PROGRAM),
source(source) {
// Look up the app preference to find out the right launch container. Default
// is to launch as a regular tab.
@@ -59,7 +59,7 @@
desktop_type(desktop_type),
override_url(),
override_bounds(),
- command_line(CommandLine::NO_PROGRAM),
+ command_line(base::CommandLine::NO_PROGRAM),
source(source) {
if (raw_disposition == NEW_FOREGROUND_TAB ||
raw_disposition == NEW_BACKGROUND_TAB) {
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index 0c6fa46..2f20caa 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -396,7 +396,7 @@
} // namespace
Gtk2UI::Gtk2UI() : middle_click_action_(GetDefaultMiddleClickAction()) {
- GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+ GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
}
void Gtk2UI::Initialize() {
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
index 56beb6d..704472c 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc
@@ -23,7 +23,7 @@
const char kAuraTransientParent[] = "aura-transient-parent";
-void CommonInitFromCommandLine(const CommandLine& command_line,
+void CommonInitFromCommandLine(const base::CommandLine& command_line,
void (*init_func)(gint*, gchar***)) {
const std::vector<std::string>& args = command_line.argv();
int argc = args.size();
@@ -50,7 +50,7 @@
namespace libgtk2ui {
-void GtkInitFromCommandLine(const CommandLine& command_line) {
+void GtkInitFromCommandLine(const base::CommandLine& command_line) {
CommonInitFromCommandLine(command_line, gtk_init);
}
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
index 6a83451a..d707185 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
@@ -100,9 +100,13 @@
std::string GetMimeTypeFilterString();
// Get KDialog command line representing the Argv array for KDialog.
- void GetKDialogCommandLine(const std::string& type, const std::string& title,
- const base::FilePath& default_path, XID parent,
- bool file_operation, bool multiple_selection, CommandLine* command_line);
+ void GetKDialogCommandLine(const std::string& type,
+ const std::string& title,
+ const base::FilePath& default_path,
+ XID parent,
+ bool file_operation,
+ bool multiple_selection,
+ base::CommandLine* command_line);
// Call KDialog on the FILE thread and post results back to the UI thread.
void CallKDialogOutput(const KDialogParams& params);
@@ -167,10 +171,10 @@
// only do this once, the first time a file dialog is displayed.
base::ThreadRestrictions::ScopedAllowIO allow_io;
- CommandLine::StringVector cmd_vector;
+ base::CommandLine::StringVector cmd_vector;
cmd_vector.push_back(kKdialogBinary);
cmd_vector.push_back("--version");
- CommandLine command_line(cmd_vector);
+ base::CommandLine command_line(cmd_vector);
std::string dummy;
return base::GetAppOutput(command_line, &dummy);
}
@@ -290,9 +294,9 @@
void SelectFileDialogImplKDE::CallKDialogOutput(const KDialogParams& params) {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
- CommandLine::StringVector cmd_vector;
+ base::CommandLine::StringVector cmd_vector;
cmd_vector.push_back(kKdialogBinary);
- CommandLine command_line(cmd_vector);
+ base::CommandLine command_line(cmd_vector);
GetKDialogCommandLine(params.type, params.title, params.default_path,
params.parent, params.file_operation,
params.multiple_selection, &command_line);
@@ -311,10 +315,14 @@
params.kdialog_params));
}
-void SelectFileDialogImplKDE::GetKDialogCommandLine(const std::string& type,
- const std::string& title, const base::FilePath& path,
- XID parent, bool file_operation, bool multiple_selection,
- CommandLine* command_line) {
+void SelectFileDialogImplKDE::GetKDialogCommandLine(
+ const std::string& type,
+ const std::string& title,
+ const base::FilePath& path,
+ XID parent,
+ bool file_operation,
+ bool multiple_selection,
+ base::CommandLine* command_line) {
CHECK(command_line);
// Attach to the current Chrome window.
diff --git a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
index 12a1794..67c61d6 100644
--- a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
+++ b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
@@ -147,7 +147,7 @@
}
TEST_F(OriginChipInfoTest, ExtensionOrigin) {
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
extensions::TestExtensionSystem* test_extension_system =
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile()));
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc
index 8d4c73e..4b5d23ce 100644
--- a/chrome/browser/ui/network_profile_bubble.cc
+++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -101,7 +101,7 @@
// start faster.
// Collect a lot of stats along the way to see which cases do occur in the
// wild often enough.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kNoNetworkProfileWarning)) {
RecordUmaEvent(METRIC_CHECK_SUPPRESSED);
return;
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index 9bbf433a..071f2f7 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -240,7 +240,7 @@
BasePanelBrowserTest::~BasePanelBrowserTest() {
}
-void BasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
+void BasePanelBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
command_line->AppendSwitch(switches::kEnablePanels);
}
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 93bb88e3..ce45650c 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -1758,7 +1758,7 @@
class PanelExtensionApiTest : public ExtensionApiTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnablePanels);
}
diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc
index 9e67571..c5a88a11 100644
--- a/chrome/browser/ui/panels/panel_extension_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc
@@ -32,7 +32,7 @@
class PanelExtensionBrowserTest : public ExtensionBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnablePanels);
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
diff --git a/chrome/browser/ui/panels/panel_manager.cc b/chrome/browser/ui/panels/panel_manager.cc
index 41e32ffc..d3c5f06d 100644
--- a/chrome/browser/ui/panels/panel_manager.cc
+++ b/chrome/browser/ui/panels/panel_manager.cc
@@ -105,7 +105,8 @@
bool PanelManager::ShouldUsePanels(const std::string& extension_id) {
#if defined(USE_X11) && !defined(OS_CHROMEOS)
// If --enable-panels is on, always use panels on Linux.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels))
return true;
// Otherwise, panels are only supported on tested window managers.
@@ -124,12 +125,12 @@
chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
channel == chrome::VersionInfo::CHANNEL_BETA) {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnablePanels) ||
- extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
- extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
- extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
- extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels) ||
+ extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd") ||
+ extension_id == std::string("ljclpkphhpbpinifbeabbhlfddcpfdde") ||
+ extension_id == std::string("ppleadejekpmccmnpjdimmlfljlkdfej") ||
+ extension_id == std::string("eggnbpckecmjlblplehfpjjdhhidfdoj");
}
return true;
diff --git a/chrome/browser/ui/passwords/password_manager_presenter.cc b/chrome/browser/ui/passwords/password_manager_presenter.cc
index 52d2eb8..b22aca2 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter.cc
@@ -30,8 +30,9 @@
exception_populater_(this),
password_view_(password_view) {
DCHECK(password_view_);
- require_reauthentication_ = !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisablePasswordManagerReauthentication);
+ require_reauthentication_ =
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePasswordManagerReauthentication);
}
PasswordManagerPresenter::~PasswordManagerPresenter() {
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index ba6d84c..b04add8 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -266,7 +266,7 @@
InstantTestBase::Init(instant_url, ntp_url, true);
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(
switches::kForceFieldTrials,
"EmbeddedSearch/Group11 prefetch_results_srp:1/");
diff --git a/chrome/browser/ui/settings_window_manager_browsertest.cc b/chrome/browser/ui/settings_window_manager_browsertest.cc
index 9f384e37..a551457 100644
--- a/chrome/browser/ui/settings_window_manager_browsertest.cc
+++ b/chrome/browser/ui/settings_window_manager_browsertest.cc
@@ -59,7 +59,7 @@
settings_manager_->RemoveObserver(&observer_);
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(::switches::kEnableSettingsWindow);
}
diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
index 01e0401..9b7e23d 100644
--- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc
+++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
@@ -152,7 +152,8 @@
if (infobar_shown >= kMaxTimesToShowInfoBar)
return false;
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kAutoLaunchAtStartup) &&
!first_run::IsChromeFirstRun()) {
return false;
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
index 0c4b77c..2c0a9b6 100644
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -78,7 +78,7 @@
};
for (const char** flag = kBadFlags; *flag; ++flag) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(*flag)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(*flag)) {
SimpleAlertInfoBarDelegate::Create(
InfoBarService::FromWebContents(web_contents),
infobars::InfoBarDelegate::kNoIconID,
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 3817eb0..07f7bb77 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -272,13 +272,12 @@
}
bool StartupBrowserCreator::LaunchBrowser(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
Profile* profile,
const base::FilePath& cur_dir,
chrome::startup::IsProcessStartup process_startup,
chrome::startup::IsFirstRun is_first_run,
int* return_code) {
-
in_synchronous_profile_launch_ =
process_startup == chrome::startup::IS_PROCESS_STARTUP;
DCHECK(profile);
@@ -353,7 +352,7 @@
// static
SessionStartupPref StartupBrowserCreator::GetSessionStartupPref(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
Profile* profile) {
DCHECK(profile);
PrefService* prefs = profile->GetPrefs();
@@ -423,12 +422,12 @@
// static
std::vector<GURL> StartupBrowserCreator::GetURLsFromCommandLine(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const base::FilePath& cur_dir,
Profile* profile) {
std::vector<GURL> urls;
- const CommandLine::StringVector& params = command_line.GetArgs();
+ const base::CommandLine::StringVector& params = command_line.GetArgs();
for (size_t i = 0; i < params.size(); ++i) {
base::FilePath param = base::FilePath(params[i]);
// Handle Vista way of searching - "? <search-term>"
@@ -481,7 +480,7 @@
// static
bool StartupBrowserCreator::ProcessCmdLineImpl(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const base::FilePath& cur_dir,
bool process_startup,
Profile* last_used_profile,
@@ -631,8 +630,8 @@
if (command_line.HasSwitch(apps::kLoadAndLaunchApp) &&
!IncognitoModePrefs::ShouldLaunchIncognito(
command_line, last_used_profile->GetPrefs())) {
- CommandLine::StringType path = command_line.GetSwitchValueNative(
- apps::kLoadAndLaunchApp);
+ base::CommandLine::StringType path =
+ command_line.GetSwitchValueNative(apps::kLoadAndLaunchApp);
if (!apps::AppLoadService::Get(last_used_profile)->LoadAndLaunch(
base::FilePath(path), command_line, cur_dir)) {
@@ -734,9 +733,10 @@
// Launch the last used profile with the full command line, and the other
// opened profiles without the URLs to launch.
- CommandLine command_line_without_urls(command_line.GetProgram());
- const CommandLine::SwitchMap& switches = command_line.GetSwitches();
- for (CommandLine::SwitchMap::const_iterator switch_it = switches.begin();
+ base::CommandLine command_line_without_urls(command_line.GetProgram());
+ const base::CommandLine::SwitchMap& switches = command_line.GetSwitches();
+ for (base::CommandLine::SwitchMap::const_iterator switch_it =
+ switches.begin();
switch_it != switches.end(); ++switch_it) {
command_line_without_urls.AppendSwitchNative(switch_it->first,
switch_it->second);
@@ -773,14 +773,15 @@
}
// static
-bool StartupBrowserCreator::ProcessLoadApps(const CommandLine& command_line,
- const base::FilePath& cur_dir,
- Profile* profile) {
- CommandLine::StringType path_list =
+bool StartupBrowserCreator::ProcessLoadApps(
+ const base::CommandLine& command_line,
+ const base::FilePath& cur_dir,
+ Profile* profile) {
+ base::CommandLine::StringType path_list =
command_line.GetSwitchValueNative(extensions::switches::kLoadApps);
- base::StringTokenizerT<CommandLine::StringType,
- CommandLine::StringType::const_iterator>
+ base::StringTokenizerT<base::CommandLine::StringType,
+ base::CommandLine::StringType::const_iterator>
tokenizer(path_list, FILE_PATH_LITERAL(","));
if (!tokenizer.GetNext())
@@ -807,7 +808,7 @@
// static
void StartupBrowserCreator::ProcessCommandLineOnProfileCreated(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const base::FilePath& cur_dir,
Profile* profile,
Profile::CreateStatus status) {
@@ -818,7 +819,7 @@
// static
void StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const base::FilePath& cur_dir,
const base::FilePath& profile_path) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ -848,7 +849,7 @@
}
base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
- const CommandLine& command_line) {
+ const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kProfileDirectory)) {
return user_data_dir.Append(
command_line.GetSwitchValuePath(switches::kProfileDirectory));
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index ba7d3b2..ec6d1a3 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -96,7 +96,7 @@
return ExtensionBrowserTest::SetUpUserDataDirectory();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnablePanels);
command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL);
@@ -186,7 +186,7 @@
ASSERT_TRUE(popup->is_type_popup());
ASSERT_EQ(popup, observer.added_browser_);
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
@@ -221,7 +221,7 @@
browser()->window()->Close();
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
@@ -266,7 +266,7 @@
SessionStartupPref::SetStartupPref(browser()->profile(), pref);
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
@@ -290,7 +290,7 @@
// Add --activate-existing-profile-browser to the command line and
// start a new process.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
dummy.AppendSwitch(switches::kActivateExistingProfileBrowser);
StartupBrowserCreator::ProcessCommandLineAlreadyRunning(
@@ -311,7 +311,7 @@
ASSERT_NO_FATAL_FAILURE(LoadApp("app_with_tab_container", &extension_app));
// Add --app-id=<extension->id()> to the command line.
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
@@ -337,7 +337,7 @@
// Set a pref indicating that the user wants to open this app in a window.
SetAppLaunchPref(extension_app->id(), extensions::LAUNCH_TYPE_WINDOW);
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
@@ -368,7 +368,7 @@
// Set a pref indicating that the user wants to open this app in a window.
SetAppLaunchPref(extension_app->id(), extensions::LAUNCH_TYPE_REGULAR);
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
@@ -434,7 +434,7 @@
browser_creator.AddFirstRunTab(test_server()->GetURL("files/title2.html"));
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -469,7 +469,7 @@
browser_creator.AddFirstRunTab(GURL("http://welcome_page"));
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -494,7 +494,7 @@
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, SyncPromoNoWelcomePage) {
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -520,7 +520,7 @@
first_run::SetShouldShowWelcomePage();
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -554,7 +554,7 @@
first_run::SetShouldShowWelcomePage();
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -587,7 +587,7 @@
browser_creator.AddFirstRunTab(GURL("http://welcome_page"));
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
@@ -619,7 +619,8 @@
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, StartupURLsForTwoProfiles) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -655,7 +656,7 @@
browser()->window()->Close();
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
int return_code;
StartupBrowserCreator browser_creator;
@@ -749,7 +750,8 @@
DISABLED_UpdateWithTwoProfiles) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -772,7 +774,7 @@
ASSERT_TRUE(profile2);
// Simulate a launch after a browser update.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
int return_code;
StartupBrowserCreator browser_creator;
std::vector<Profile*> last_opened_profiles;
@@ -814,7 +816,8 @@
ProfilesWithoutPagesNotLaunched) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -874,7 +877,7 @@
browser()->window()->Close();
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
int return_code;
StartupBrowserCreator browser_creator;
@@ -928,7 +931,8 @@
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
@@ -990,7 +994,7 @@
base::HistogramTester histogram_tester;
#endif // !defined(OS_MACOSX) && !defined(GOOGLE_CHROME_BUILD)
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
dummy.AppendSwitchASCII(switches::kTestType, "browser");
int return_code;
StartupBrowserCreator browser_creator;
@@ -1050,7 +1054,7 @@
class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
InProcessBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
@@ -1061,7 +1065,7 @@
StartupBrowserCreator browser_creator;
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
content::WindowedNotificationObserver observer(
@@ -1092,7 +1096,7 @@
class StartupBrowserCreatorFirstRunTest : public InProcessBrowserTest {
protected:
- void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpInProcessBrowserTestFixture() override;
#if defined(ENABLE_CONFIGURATION_POLICY)
@@ -1102,7 +1106,7 @@
};
void StartupBrowserCreatorFirstRunTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
command_line->AppendSwitch(switches::kForceFirstRun);
}
@@ -1146,7 +1150,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, false);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1187,7 +1191,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, true);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1229,7 +1233,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, true);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1276,7 +1280,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, true);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1323,7 +1327,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, true);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1370,7 +1374,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, false);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1414,7 +1418,7 @@
prefs::kSignInPromoShowOnFirstRunAllowed, false);
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
@@ -1471,7 +1475,7 @@
base::RunLoop().RunUntilIdle();
// Do a process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
chrome::startup::IS_FIRST_RUN);
ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 4121879..42eedc7 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -292,7 +292,7 @@
StartupBrowserCreatorImpl::StartupBrowserCreatorImpl(
const base::FilePath& cur_dir,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
chrome::startup::IsFirstRun is_first_run)
: cur_dir_(cur_dir),
command_line_(command_line),
@@ -303,7 +303,7 @@
StartupBrowserCreatorImpl::StartupBrowserCreatorImpl(
const base::FilePath& cur_dir,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
StartupBrowserCreator* browser_creator,
chrome::startup::IsFirstRun is_first_run)
: cur_dir_(cur_dir),
@@ -616,7 +616,7 @@
uint32 restore_behavior = SessionRestore::SYNCHRONOUS;
if (browser_defaults::kAlwaysCreateTabbedBrowserOnSessionRestore ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kCreateBrowserOnStartupForTests)) {
restore_behavior |= SessionRestore::ALWAYS_CREATE_TABBED_BROWSER;
}
@@ -803,8 +803,9 @@
browser->window()->Show();
// In kiosk mode, we want to always be fullscreen, so switch to that now.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartFullscreen))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kStartFullscreen))
chrome::ToggleFullscreenMode(browser);
return browser;
diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
index 1ed4d9d..eb2f2f7e 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
@@ -58,7 +58,7 @@
SessionStartupPref::SetStartupPref(profile_4, pref_urls);
// Do a simple non-process-startup browser launch.
- CommandLine dummy(CommandLine::NO_PROGRAM);
+ base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
int return_code;
StartupBrowserCreator browser_creator;
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
index 6d05b0a4..10b5228 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
@@ -34,7 +34,8 @@
ChromeRenderViewHostTestHarness::SetUp();
// Disable sync to simplify the creation of a OneClickSigninSyncStarter.
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSync);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kDisableSync);
SigninManagerBase* signin_manager = static_cast<FakeSigninManager*>(
SigninManagerFactory::GetForProfile(profile()));
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
index 85b6739f..69e9dabd 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
@@ -18,7 +18,7 @@
public:
ProfileSigninConfirmationHelperBrowserTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
// Force the first-run flow to trigger autoimport.
InProcessBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kForceFirstRun);
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 5a378896..3d779ec7 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -146,7 +146,7 @@
extensions::TestExtensionSystem* system =
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile_.get()));
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
system->CreateExtensionService(&command_line,
base::FilePath(kExtensionFilePath),
false);
diff --git a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
index 15673d6..e19b22c 100644
--- a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
+++ b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
@@ -29,7 +29,8 @@
protected:
void DisableSync() {
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSync);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kDisableSync);
}
scoped_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index 7305c73..78b13a6 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -150,8 +150,9 @@
void CoreTabHelper::WebContentsDestroyed() {
// OnCloseStarted isn't called in unit tests.
if (!close_start_time_.is_null()) {
- bool fast_tab_close_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableFastUnload);
+ bool fast_tab_close_enabled =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableFastUnload);
if (fast_tab_close_enabled) {
base::TimeTicks now = base::TimeTicks::Now();
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 4828802..fd8a661b 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -213,7 +213,7 @@
#endif // defined(ENABLE_PRINT_PREVIEW)
#endif // defined(ENABLE_PRINTING) && !defined(OS_ANDROID)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableDomDistiller)) {
dom_distiller::WebContentsMainFrameObserver::CreateForWebContents(
web_contents);
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 241ddcc..1dc0ac2a 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -364,8 +364,8 @@
// The same URL, when specified on the command line, should allow search term
// extraction.
UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
- CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
- "http://www.foo.com/");
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ switches::kGoogleBaseURL, "http://www.foo.com/");
NavigateAndCheckText(
GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
base::ASCIIToUTF16("tractor supply"), true, true);
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index c4d9efb..01df43f 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -876,7 +876,7 @@
// appended when this is a touch menu - otherwise it would get added twice.
CreateCutCopyPasteMenu();
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableDomDistiller)) {
AddItemWithStringId(IDC_DISTILL_PAGE, IDS_DISTILL_PAGE);
}
@@ -921,7 +921,7 @@
#endif
#if defined(OS_CHROMEOS)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableRequestTabletSite))
AddCheckItemWithStringId(IDC_TOGGLE_REQUEST_TABLET_SITE,
IDS_TOGGLE_REQUEST_TABLET_SITE);
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
index 6f26c49..2a2c5b9 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
+++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
@@ -51,7 +51,7 @@
// static
AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH) {
- DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(
+ DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kViewerConnect));
return AppListServiceAsh::GetInstance();
}
@@ -61,7 +61,8 @@
// static
void AppListService::InitAll(Profile* initial_profile) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kViewerConnect))
AppListServiceAsh::GetInstance()->Init(initial_profile);
AppListServiceWin::GetInstance()->Init(initial_profile);
@@ -104,15 +105,15 @@
return dist->GetShortcutName(BrowserDistribution::SHORTCUT_APP_LAUNCHER);
}
-CommandLine GetAppListCommandLine() {
+base::CommandLine GetAppListCommandLine() {
const char* const kSwitchesToCopy[] = { switches::kUserDataDir };
- CommandLine* current = CommandLine::ForCurrentProcess();
+ base::CommandLine* current = base::CommandLine::ForCurrentProcess();
base::FilePath chrome_exe;
if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
NOTREACHED();
- return CommandLine(CommandLine::NO_PROGRAM);
+ return base::CommandLine(base::CommandLine::NO_PROGRAM);
}
- CommandLine command_line(chrome_exe);
+ base::CommandLine command_line(chrome_exe);
command_line.CopySwitchesFrom(*current, kSwitchesToCopy,
arraysize(kSwitchesToCopy));
command_line.AppendSwitch(switches::kShowAppList);
@@ -124,7 +125,7 @@
// but different for different user data directories, so base it on the
// initial profile in the current user data directory.
base::FilePath initial_profile_path;
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserDataDir)) {
initial_profile_path =
command_line->GetSwitchValuePath(switches::kUserDataDir).AppendASCII(
@@ -242,7 +243,7 @@
}
ui::win::SetAppIdForWindow(GetAppModelId(), hwnd);
- CommandLine relaunch = GetAppListCommandLine();
+ base::CommandLine relaunch = GetAppListCommandLine();
base::string16 app_name(GetAppListShortcutName());
ui::win::SetRelaunchDetailsForWindow(
relaunch.GetCommandLineString(), app_name, hwnd);
@@ -371,7 +372,7 @@
}
bool AppListServiceWin::IsWarmupNeeded() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (!g_browser_process || g_browser_process->IsShuttingDown() ||
browser_shutdown::IsTryingToQuit() ||
command_line->HasSwitch(switches::kTestType)) {
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
index efe119c1..28d8a53e 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
@@ -38,7 +38,7 @@
AppInfoDialogViewsTest()
: widget_(NULL),
widget_destroyed_(false),
- command_line_(CommandLine::NO_PROGRAM) {}
+ command_line_(base::CommandLine::NO_PROGRAM) {}
~AppInfoDialogViewsTest() override {}
// Overridden from testing::Test:
@@ -128,7 +128,7 @@
AppInfoDialog* dialog_; // Owned by widget_ through views heirarchy.
private:
- CommandLine command_line_;
+ base::CommandLine command_line_;
scoped_refptr<const extensions::Extension> app_;
diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
index 0b06a156c..2290bd8 100644
--- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
+++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc
@@ -38,7 +38,7 @@
: target_index_(-1) {
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
command_line->AppendSwitch(chromeos::switches::kNaturalScrollDefault);
#endif
diff --git a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
index db068c1..f7cba3e 100644
--- a/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
+++ b/chrome/browser/ui/views/athena/chrome_browser_main_extra_parts_athena.cc
@@ -45,13 +45,13 @@
ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
}
virtual void PostProfileInit() override {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableZeroBrowsersOpenForTests)) {
chrome::IncrementKeepAliveCount();
}
Profile* profile =
g_browser_process->profile_manager()->GetActiveUserProfile();
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kLoginManager)) {
athena::CreateVirtualKeyboardWithContext(profile);
athena::StartAthenaSessionWithContext(profile);
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index 6936428a..7f60bbd 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -322,7 +322,7 @@
parent_->OnMediaListRowsChanged();
std::string autoselect_source =
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kAutoSelectDesktopCaptureSource);
if (!autoselect_source.empty() &&
base::ASCIIToUTF16(autoselect_source) == source.name) {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 6c1539f7..8f58f13 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1840,7 +1840,8 @@
return false;
bool fast_tab_closing_enabled =
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableFastUnload);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableFastUnload);
if (!browser_->tab_strip_model()->empty()) {
// Tab strip isn't empty. Hide the frame (so it appears to have closed
@@ -2002,7 +2003,7 @@
// Start a hung plugin window detector for this browser object (as long as
// hang detection is not disabled).
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableHangMonitor)) {
InitHangMonitor();
}
@@ -2308,7 +2309,7 @@
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
// Kiosk mode needs the whole screen, and if we're not in an Ash desktop
// immersive fullscreen doesn't exist.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
return false;
}
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index 1f672e4..806241dc 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -81,7 +81,8 @@
EXPECT_EQ(S_OK, pps->GetValue(PKEY_AppUserModel_RelaunchCommand,
prop_var.Receive()));
EXPECT_EQ(VT_LPWSTR, prop_var.get().vt);
- CommandLine cmd_line(CommandLine::FromString(prop_var.get().pwszVal));
+ base::CommandLine cmd_line(
+ base::CommandLine::FromString(prop_var.get().pwszVal));
EXPECT_EQ(browser->profile()->GetPath().BaseName().value(),
cmd_line.GetSwitchValueNative(switches::kProfileDirectory));
prop_var.Reset();
@@ -120,7 +121,8 @@
S_OK,
pps->GetValue(PKEY_AppUserModel_RelaunchCommand, prop_var.Receive()));
EXPECT_EQ(VT_LPWSTR, prop_var.get().vt);
- CommandLine cmd_line(CommandLine::FromString(prop_var.get().pwszVal));
+ base::CommandLine cmd_line(
+ base::CommandLine::FromString(prop_var.get().pwszVal));
EXPECT_EQ(browser->profile()->GetPath().BaseName().value(),
cmd_line.GetSwitchValueNative(switches::kProfileDirectory));
EXPECT_EQ(base::UTF8ToWide(extension->id()),
@@ -167,7 +169,7 @@
public:
BrowserTestWithProfileShortcutManager() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kEnableProfileShortcutManager);
}
@@ -180,7 +182,8 @@
IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
DISABLED_WindowProperties) {
// Disable this test in Metro+Ash where Windows window properties aren't used.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
// This test checks HWND properties that are only available on Win7+.
@@ -231,7 +234,8 @@
IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) {
#if defined(USE_ASH)
// Disable this test in Metro+Ash where Windows window properties aren't used.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
index 166218be..59996a15 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
@@ -80,7 +80,7 @@
const base::FilePath& profile_path = profile->GetPath();
// Set relaunch details to use profile.
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
base::FilePath icon_path;
shortcut_manager->GetShortcutProperties(profile_path, &command_line,
&pinned_name, &icon_path);
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
index 51ae68c..1d0f219 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -202,7 +202,8 @@
void AddAvatarButton() {
// Disable the New Avatar Menu.
- switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::DisableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
menu_button_ = new AvatarMenuButton(nullptr, false);
menu_button_->set_id(VIEW_ID_AVATAR_BUTTON);
@@ -223,7 +224,8 @@
void AddNewAvatarButton() {
// Enable the New Avatar Menu.
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
new_avatar_button_ =
new views::MenuButton(nullptr, base::string16(), nullptr, false);
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
index ca13c2ca..e877f97 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -112,7 +112,7 @@
}
void SystemMenuModelBuilder::AddFrameToggleItems(ui::SimpleMenuModel* model) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDebugEnableFrameToggle)) {
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItem(IDC_DEBUG_FRAME_TOGGLE,
diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
index 1baa7466..8dece781 100644
--- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
@@ -72,7 +72,7 @@
public:
StarViewTestNoDWM() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kDisableDwmComposition);
}
};
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
index f2377a6..4e0ef03 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -295,7 +295,8 @@
// Tests if executing a command hides touch editing handles.
IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest,
DeactivateTouchEditingOnExecuteCommand) {
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableTouchEditing);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableTouchEditing);
OmniboxView* view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view));
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
index cc23402..7ad8447 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc
@@ -84,7 +84,8 @@
IN_PROC_BROWSER_TEST_F(AvatarMenuButtonTest, MAYBE_HideOnSecondClick) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kAshBrowserTests))
return;
#endif
diff --git a/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc
index 1434b26..0591895 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc
@@ -31,7 +31,7 @@
protected:
void SetUp() override;
- void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
void CreateTestingProfile();
void StartAvatarMenu();
@@ -50,7 +50,8 @@
DCHECK(switches::IsNewAvatarMenu());
}
-void NewAvatarMenuButtonTest::SetUpCommandLine(CommandLine* command_line) {
+void NewAvatarMenuButtonTest::SetUpCommandLine(
+ base::CommandLine* command_line) {
switches::EnableNewAvatarMenuForTesting(command_line);
}
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
index a4012e1..4d72949 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -36,7 +36,7 @@
protected:
void SetUp() override;
- void SetUpCommandLine(CommandLine* command_line) override;
+ void SetUpCommandLine(base::CommandLine* command_line) override;
void OpenProfileChooserView();
private:
@@ -55,8 +55,9 @@
}
void ProfileChooserViewBrowserTest::SetUpCommandLine(
- CommandLine* command_line) {
- switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+ base::CommandLine* command_line) {
+ switches::EnableNewAvatarMenuForTesting(
+ base::CommandLine::ForCurrentProcess());
}
void ProfileChooserViewBrowserTest::OpenProfileChooserView() {
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc
index a8cfc1ed..44944d0 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc
@@ -91,7 +91,8 @@
#if defined(OS_CHROMEOS)
return false;
#else
- const base::CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kDisableSessionCrashedBubble))
return false;
if (command_line.HasSwitch(switches::kEnableSessionCrashedBubble))
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 9f1b86e..20a5cb4c 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -1440,7 +1440,7 @@
DetachToBrowserInSeparateDisplayTabDragControllerTest() {}
virtual ~DetachToBrowserInSeparateDisplayTabDragControllerTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line);
// Make screens sufficiently wide to host 2 browsers side by side.
command_line->AppendSwitchASCII("ash-host-window-bounds",
@@ -1818,7 +1818,7 @@
DifferentDeviceScaleFactorDisplayTabDragControllerTest() {}
virtual ~DifferentDeviceScaleFactorDisplayTabDragControllerTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
DetachToBrowserTabDragControllerTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII("ash-host-window-bounds",
"400x400,0+400-800x800*2");
@@ -1917,7 +1917,7 @@
public:
DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
TabDragControllerTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII("ash-host-window-bounds",
"0+0-250x250,251+0-250x250");
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.cc b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
index fbc5833..083e56df 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
@@ -53,11 +53,11 @@
// static
bool PermissionBubbleManager::Enabled() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnablePermissionsBubbles))
return true;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisablePermissionsBubbles))
return false;
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
index efa8e7fd..2e1ea07 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc
@@ -118,7 +118,7 @@
TEST_F(PermissionBubbleManagerTest, TestFlag) {
EXPECT_FALSE(PermissionBubbleManager::Enabled());
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnablePermissionsBubbles);
EXPECT_TRUE(PermissionBubbleManager::Enabled());
}
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index cb7777e..8fb22b8 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -157,8 +157,9 @@
kRememberCertificateErrorDecisionsFieldTrialDefaultGroup) != 0 &&
group_name.compare(
kRememberCertificateErrorDecisionsFieldTrialDisableGroup) != 0;
- bool has_command_line_switch = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kRememberCertErrorDecisions);
+ bool has_command_line_switch =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kRememberCertErrorDecisions);
return in_experimental_group || has_command_line_switch;
}
@@ -688,7 +689,8 @@
for (size_t i = 0; i < arraysize(kPermissionType); ++i) {
permission_info.type = kPermissionType[i];
if (permission_info.type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
- const CommandLine* command_line = CommandLine::ForCurrentProcess();
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
if (!command_line->HasSwitch(switches::kEnableWebMIDI))
continue;
}
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 454ba65..3dbe9e6 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -835,7 +835,7 @@
l10n_util::GetStringUTF8(IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE));
data.append("<style>body { max-width: 70ex; padding: 2ex 5ex; }</style>");
AppendBody(&data);
- base::FilePath binary = CommandLine::ForCurrentProcess()->GetProgram();
+ base::FilePath binary = base::CommandLine::ForCurrentProcess()->GetProgram();
data.append(l10n_util::GetStringFUTF8(
IDS_ABOUT_LINUX_PROXY_CONFIG_BODY,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index 6e94f87..79bf9197 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -80,12 +80,12 @@
FILE_PATH_LITERAL("bidichecker_tests.js");
void WebUIBidiCheckerBrowserTest::SetUp() {
- argv_ = CommandLine::ForCurrentProcess()->GetArgs();
+ argv_ = base::CommandLine::ForCurrentProcess()->GetArgs();
}
void WebUIBidiCheckerBrowserTest::TearDown() {
// Reset command line to the way it was before the test was run.
- CommandLine::ForCurrentProcess()->InitFromArgv(argv_);
+ base::CommandLine::ForCurrentProcess()->InitFromArgv(argv_);
}
WebUIBidiCheckerBrowserTest::~WebUIBidiCheckerBrowserTest() {}
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
index 91fc8f4..dcf7077 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -58,7 +58,7 @@
"nextButton", l10n_util::GetStringUTF16(IDS_FIRST_RUN_NEXT_BUTTON));
localized_strings->SetBoolean(
"transitionsEnabled",
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableFirstRunUITransitions));
std::string shelf_alignment;
ash::Shell* shell = ash::Shell::GetInstance();
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 60b3aa0..0182262 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -258,7 +258,7 @@
source->AddString("keyboardOverlayLearnMoreURL",
base::UTF8ToUTF16(kLearnMoreURL));
source->AddBoolean("keyboardOverlayHasChromeOSDiamondKey",
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kHasChromeOSDiamondKey));
ash::Shell* shell = ash::Shell::GetInstance();
ash::DisplayManager* display_manager = shell->display_manager();
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
index bb465d4..b65e16b 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
+++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
@@ -35,7 +35,8 @@
// Public methods.
void DemoModeDetector::InitDetection() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableDemoMode))
return;
if (base::SysInfo::IsRunningOnChromeOS()) {
@@ -104,7 +105,7 @@
}
void DemoModeDetector::SetupTimeouts() {
- CommandLine* cmdline = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
DCHECK(cmdline);
PrefService* prefs = g_browser_process->local_state();
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 6378475..037d21f 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -212,7 +212,7 @@
params.Set("localizedStrings", localized_strings);
}
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
const GURL gaia_url =
command_line->HasSwitch(::switches::kGaiaUrl)
@@ -720,7 +720,7 @@
}
context.embedded_signin_enabled =
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableEmbeddedSignin) ||
embedded_signin_enabled_by_shortcut_;
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index ac46736..3a623ec6 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -491,7 +491,7 @@
// If we're not doing boot animation then WebUI should trigger
// wallpaper load on boot.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableBootAnimation)) {
localized_strings->SetString("bootIntoWallpaper", "on");
} else {
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
index 4971756..75cf4e44 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
@@ -93,7 +93,7 @@
void ResetScreenHandler::ChooseAndApplyShowScenario() {
PrefService* prefs = g_browser_process->local_state();
- restart_required_ = !CommandLine::ForCurrentProcess()->HasSwitch(
+ restart_required_ = !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kFirstExecAfterBoot);
reboot_was_requested_ = false;
@@ -101,7 +101,7 @@
if (!restart_required_) // First exec after boot.
reboot_was_requested_ = prefs->GetBoolean(prefs::kFactoryResetRequested);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableRollbackOption)) {
rollback_available_ = false;
ShowWithParams();
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 1bf767e..6769e9ef 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -191,7 +191,7 @@
// Serve static response while connecting to the remote device.
if (StartsWithASCII(path, kRemoteOpenPrefix, false)) {
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableDevToolsExperiments)) {
callback.Run(NULL);
return;
@@ -377,8 +377,8 @@
void DevToolsUI::NavigationEntryCommitted(
const content::LoadCommittedDetails& load_details) {
content::NavigationEntry* entry = load_details.entry;
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableDevToolsExperiments)) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableDevToolsExperiments)) {
return;
}
diff --git a/chrome/browser/ui/webui/downloads_ui_supervised_browsertest.cc b/chrome/browser/ui/webui/downloads_ui_supervised_browsertest.cc
index 52d7f275..2e3f0874 100644
--- a/chrome/browser/ui/webui/downloads_ui_supervised_browsertest.cc
+++ b/chrome/browser/ui/webui/downloads_ui_supervised_browsertest.cc
@@ -10,6 +10,6 @@
#include "content/public/test/test_utils.h"
void DownloadsWebUIForSupervisedUsersTest::SetUpCommandLine(
- CommandLine* command_line) {
+ base::CommandLine* command_line) {
command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
}
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index d586c82..18e67607 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -222,12 +222,12 @@
#if defined(OS_CHROMEOS)
// On ChromeOS be less intrusive and restart inside the user session after
// we apply the newly selected flags.
- CommandLine user_flags(CommandLine::NO_PROGRAM);
+ base::CommandLine user_flags(base::CommandLine::NO_PROGRAM);
about_flags::ConvertFlagsToSwitches(flags_storage_.get(),
&user_flags,
about_flags::kAddSentinels);
- CommandLine::StringVector flags;
- // argv[0] is the program name |CommandLine::NO_PROGRAM|.
+ base::CommandLine::StringVector flags;
+ // argv[0] is the program name |base::CommandLine::NO_PROGRAM|.
flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
VLOG(1) << "Restarting to apply per-session flags...";
chromeos::DBusThreadManager::Get()
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index b0e4aa5..2e44951 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -278,8 +278,8 @@
IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_UNSTABLE_MESSAGE,
product_name));
- if (CommandLine::ForCurrentProcess()->
- HasSwitch(chromeos::switches::kDisableNewChannelSwitcherUI)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kDisableNewChannelSwitcherUI)) {
localized_strings->SetBoolean("disableNewChannelSwitcherUI", true);
}
#endif
@@ -295,8 +295,8 @@
localized_strings->SetString("userAgentInfo", GetUserAgent());
- CommandLine::StringType command_line =
- CommandLine::ForCurrentProcess()->GetCommandLineString();
+ base::CommandLine::StringType command_line =
+ base::CommandLine::ForCurrentProcess()->GetCommandLineString();
localized_strings->SetString("commandLineInfo", command_line);
}
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index af27ce7..2a6d248 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -190,9 +190,10 @@
source->AddLocalizedString("entrySummary", IDS_HISTORY_ENTRY_SUMMARY);
source->AddBoolean("isFullHistorySyncEnabled",
WebHistoryServiceFactory::GetForProfile(profile) != NULL);
- source->AddBoolean("groupByDomain", profile->IsSupervised() ||
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kHistoryEnableGroupByDomain));
+ source->AddBoolean("groupByDomain",
+ profile->IsSupervised() ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kHistoryEnableGroupByDomain));
bool allow_deleting_history =
prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory);
source->AddBoolean("allowDeletingHistory", allow_deleting_history);
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
index 0dcba84..fb99545 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc
@@ -424,7 +424,7 @@
AddLibrary(base::FilePath(FILE_PATH_LITERAL("local_discovery_ui_test.js")));
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
#if defined(OS_CHROMEOS)
// On chromeos, don't sign in with the stub-user automatically. Use the
// kLoginUser instead.
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index 4a9518e..3fd74d6 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -110,8 +110,8 @@
// Google Chrome builds. Use a command-line switch for Windows non-Google
// Chrome builds.
cloud_print_connector_ui_enabled_ =
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableCloudPrintProxy);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableCloudPrintProxy);
#else
// Always enabled for Linux and Google Chrome Windows builds.
// Never enabled for Chrome OS, we don't even need to indicate it.
@@ -204,7 +204,7 @@
#endif
#if defined(ENABLE_WIFI_BOOTSTRAPPING)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableCloudDevices)) {
StartWifiBootstrapping();
}
@@ -264,8 +264,8 @@
cloud_devices_.clear();
cloud_print_printer_list_ = CreateApiFlow();
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableCloudDevices)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableCloudDevices)) {
cloud_device_list_ = CreateApiFlow();
}
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index b71ea77..d844a40 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -276,7 +276,8 @@
void NaClDomHandler::AddNaClInfo(base::ListValue* list) {
base::string16 nacl_enabled_string = ASCIIToUTF16("Disabled");
if (isPluginEnabled(0) &&
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNaCl)) {
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableNaCl)) {
nacl_enabled_string = ASCIIToUTF16("Enabled by flag '--enable-nacl'");
}
AddPair(list,
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 2c2fb2d8..2bff00ad 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1448,8 +1448,9 @@
dict->SetString("official",
version_info.IsOfficialBuild() ? "official" : "unofficial");
dict->SetString("os_type", version_info.OSType());
- dict->SetString("command_line",
- CommandLine::ForCurrentProcess()->GetCommandLineString());
+ dict->SetString(
+ "command_line",
+ base::CommandLine::ForCurrentProcess()->GetCommandLineString());
constants_dict->Set("clientInfo", dict);
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index 5994fe5..4a31728 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -322,7 +322,7 @@
NetInternalsTest::~NetInternalsTest() {
}
-void NetInternalsTest::SetUpCommandLine(CommandLine* command_line) {
+void NetInternalsTest::SetUpCommandLine(base::CommandLine* command_line) {
WebUIBrowserTest::SetUpCommandLine(command_line);
// Needed to test the prerender view.
command_line->AppendSwitchASCII(switches::kPrerenderMode,
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index 630d4055..5c0130ed 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -152,7 +152,7 @@
public:
NewTabUIProcessPerTabTest() {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kProcessPerTab);
}
};
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index 3ba0bc9..105ac6b 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -551,8 +551,9 @@
}
// Determine whether to show the menu for accessing tabs on other devices.
- bool show_other_sessions_menu = should_show_other_devices_menu_ &&
- !CommandLine::ForCurrentProcess()->HasSwitch(
+ bool show_other_sessions_menu =
+ should_show_other_devices_menu_ &&
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableNTPOtherSessionsMenu);
load_time_data.SetBoolean("showOtherSessionsMenu", show_other_sessions_menu);
load_time_data.SetBoolean(
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 7d807c6..b807d16 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -640,16 +640,14 @@
"easyUnlockAllowed",
EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->IsAllowed());
values->SetString("easyUnlockLearnMoreURL", chrome::kEasyUnlockLearnMoreUrl);
- values->SetBoolean(
- "easyUnlockProximityDetectionAllowed",
- CommandLine::ForCurrentProcess()->HasSwitch(
- proximity_auth::switches::kEnableProximityDetection));
+ values->SetBoolean("easyUnlockProximityDetectionAllowed",
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ proximity_auth::switches::kEnableProximityDetection));
#if defined(OS_CHROMEOS)
- values->SetBoolean(
- "consumerManagementEnabled",
- CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableConsumerManagement));
+ values->SetBoolean("consumerManagementEnabled",
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableConsumerManagement));
RegisterTitle(values, "thirdPartyImeConfirmOverlay",
IDS_OPTIONS_SETTINGS_LANGUAGES_THIRD_PARTY_WARNING_TITLE);
@@ -660,7 +658,7 @@
values->SetBoolean("allowAdvancedSettings", ShouldAllowAdvancedSettings());
values->SetBoolean("websiteSettingsManagerEnabled",
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableWebsiteSettingsManager));
values->SetBoolean("usingNewProfilesUI", switches::IsNewAvatarMenu());
@@ -878,7 +876,8 @@
#if defined(OS_WIN)
ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->AddObserver(this);
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
if (!command_line.HasSwitch(switches::kUserDataDir)) {
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
base::Bind(&BrowserOptionsHandler::CheckAutoLaunch,
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
index ee3c29f6..84a002ac 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
@@ -56,7 +56,7 @@
LoginManagerTest::TearDownOnMainThread();
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
LoginManagerTest::SetUpCommandLine(command_line);
}
diff --git a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
index 5ea9afa..1c9cf0e9 100644
--- a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc
@@ -17,7 +17,7 @@
public:
GuestModeOptionsBrowserTest() : OptionsUIBrowserTest() {}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(chromeos::switches::kGuestSession);
command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
chromeos::login::kGuestUserName);
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index ce5f031a..ac27f97 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -289,8 +289,8 @@
LoginState::LOGGED_IN_USER_OWNER;
localized_strings->SetBoolean(kLoggedInAsOwnerKey, logged_in_as_owner);
localized_strings->SetBoolean(
- kShowCarrierSelectKey, CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kEnableCarrierSwitching));
+ kShowCarrierSelectKey, base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kEnableCarrierSwitching));
base::DictionaryValue* network_dictionary = new base::DictionaryValue;
FillNetworkInfo(network_dictionary);
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
index 97398d9..69b4eae 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -134,11 +134,11 @@
}
void KeyboardHandler::InitializePage() {
- bool chromeos_keyboard = CommandLine::ForCurrentProcess()->HasSwitch(
+ bool chromeos_keyboard = base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kHasChromeOSKeyboard);
const base::FundamentalValue show_caps_lock_options(!chromeos_keyboard);
- bool has_diamond_key = CommandLine::ForCurrentProcess()->HasSwitch(
+ bool has_diamond_key = base::CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kHasChromeOSDiamondKey);
const base::FundamentalValue show_diamond_key_options(has_diamond_key);
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 08222e7a1..d7de5f4c 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -969,7 +969,8 @@
}
void ContentSettingsHandler::UpdateMIDISysExExceptionsView() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebMIDI)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableWebMIDI)) {
web_ui()->CallJavascriptFunction(
"ContentSettings.showExperimentalWebMIDISettings",
base::FundamentalValue(true));
diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc
index 5ab100f..0cfd34b 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_common.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc
@@ -118,7 +118,8 @@
GetSpellCheckLanguageCodeSet());
localized_strings->Set("uiLanguageCodeSet", GetUILanguageCodeSet());
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
bool enable_spelling_auto_correct =
command_line.HasSwitch(switches::kEnableSpellingAutoCorrect);
localized_strings->SetBoolean("enableSpellingAutoCorrect",
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 218858f3..8378ecf 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -164,7 +164,7 @@
InProcessBrowserTest::SetUp();
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
const GURL& base_url = embedded_test_server()->base_url();
command_line->AppendSwitchASCII(::switches::kGaiaUrl, base_url.spec());
command_line->AppendSwitchASCII(::switches::kLsoUrl, base_url.spec());
diff --git a/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc b/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
index b88be819..ec09793 100644
--- a/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_ui_browsertest.cc
@@ -32,7 +32,7 @@
DCHECK(switches::IsNewAvatarMenu());
}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
switches::EnableNewAvatarMenuForTesting(command_line);
}
};
diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc
index 6797a13d..ba348d9 100644
--- a/chrome/browser/ui/webui/version_handler.cc
+++ b/chrome/browser/ui/webui/version_handler.cc
@@ -29,7 +29,7 @@
DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
base::FilePath executable_path = base::MakeAbsoluteFilePath(
- CommandLine::ForCurrentProcess()->GetProgram());
+ base::CommandLine::ForCurrentProcess()->GetProgram());
if (!executable_path.empty()) {
*exec_path_out = executable_path.LossyDisplayName();
} else {
diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
index a6fd3b4..c79d6ca 100644
--- a/chrome/browser/ui/webui/version_ui.cc
+++ b/chrome/browser/ui/webui/version_ui.cc
@@ -90,12 +90,14 @@
IDS_ABOUT_VERSION_COMMAND_LINE);
#if defined(OS_WIN)
- html_source->AddString("command_line", base::WideToUTF16(
- CommandLine::ForCurrentProcess()->GetCommandLineString()));
+ html_source->AddString(
+ "command_line",
+ base::WideToUTF16(
+ base::CommandLine::ForCurrentProcess()->GetCommandLineString()));
#elif defined(OS_POSIX)
std::string command_line;
typedef std::vector<std::string> ArgvList;
- const ArgvList& argv = CommandLine::ForCurrentProcess()->argv();
+ const ArgvList& argv = base::CommandLine::ForCurrentProcess()->argv();
for (ArgvList::const_iterator iter = argv.begin(); iter != argv.end(); iter++)
command_line += " " + *iter;
// TODO(viettrungluu): |command_line| could really have any encoding, whereas
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 08976474..825176b 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -157,7 +157,8 @@
// Revisit and address.
#if defined(OS_WIN)
force_ash = ash::Shell::HasInstance() &&
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect);
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kViewerConnect);
#endif
// Use the target display on ash.
if (chrome::ShouldOpenAshOnStartup() || force_ash) {
@@ -431,7 +432,8 @@
if (show_state)
return browser_->initial_show_state();
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kStartMaximized))
return ui::SHOW_STATE_MAXIMIZED;
if (browser_->initial_show_state() != ui::SHOW_STATE_DEFAULT)
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 908ad8c..fb0988e 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -27,7 +27,7 @@
WindowSizerTest() {}
~WindowSizerTest() override {}
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
InProcessBrowserTest::SetUpCommandLine(command_line);
// Make screens sufficiently wide to host 2 browsers side by side.
command_line->AppendSwitchASCII("ash-host-window-bounds",
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index 96be5de..bcfdd4f 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -100,7 +100,7 @@
// where the default window bounds calculation is invoked.
TEST_F(WindowSizerAshTest, MAYBE_DefaultSizeCase) {
#if defined(OS_WIN)
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kOpenAsh);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(switches::kOpenAsh);
#endif
{ // 4:3 monitor case, 1024x768, no taskbar
gfx::Rect window_bounds;
@@ -889,7 +889,8 @@
// Check that setting the maximized command line option is forcing the
// maximized state.
- CommandLine::ForCurrentProcess()->AppendSwitch(switches::kStartMaximized);
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kStartMaximized);
browser_window->browser()->set_initial_show_state(ui::SHOW_STATE_NORMAL);
EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL,
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 42767302..0a85e6af 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -113,7 +113,7 @@
class UnloadTest : public InProcessBrowserTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
const testing::TestInfo* const test_info =
testing::UnitTest::GetInstance()->current_test_info();
if (strcmp(test_info->name(),
@@ -196,7 +196,8 @@
// This test is flaky on the valgrind UI bots. http://crbug.com/39057
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadAsync) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
NavigateToDataURL(INFINITE_UNLOAD_HTML, "infiniteunload");
@@ -209,7 +210,8 @@
// we correctly nav to each one.
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteUnloadSync) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
NavigateToDataURL(INFINITE_UNLOAD_HTML, "infiniteunload");
@@ -224,7 +226,8 @@
// http://crbug.com/86469
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadAsync) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
NavigateToDataURL(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload");
@@ -238,7 +241,8 @@
// If this flakes, see bug http://crbug.com/86469.
IN_PROC_BROWSER_TEST_F(UnloadTest, CrossSiteInfiniteBeforeUnloadSync) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
NavigateToDataURL(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload");
@@ -329,7 +333,8 @@
// the unload handler has an infinite loop.
IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnload) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
LoadUrlAndQuitBrowser(INFINITE_UNLOAD_HTML, "infiniteunload");
@@ -339,7 +344,8 @@
// If this flakes, use http://crbug.com/78803 and http://crbug.com/86469
IN_PROC_BROWSER_TEST_F(UnloadTest, DISABLED_BrowserCloseInfiniteBeforeUnload) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_HTML, "infinitebeforeunload");
@@ -350,7 +356,8 @@
// If this flakes, use http://crbug.com/86469
IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseInfiniteUnloadAlert) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
LoadUrlAndQuitBrowser(INFINITE_UNLOAD_ALERT_HTML, "infiniteunloadalert");
@@ -362,7 +369,8 @@
IN_PROC_BROWSER_TEST_F(UnloadTest,
DISABLED_BrowserCloseInfiniteBeforeUnloadAlert) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
LoadUrlAndQuitBrowser(INFINITE_BEFORE_UNLOAD_ALERT_HTML,
@@ -416,7 +424,7 @@
class FastUnloadTest : public UnloadTest {
public:
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
UnloadTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnableFastUnload);
}
@@ -620,7 +628,8 @@
IN_PROC_BROWSER_TEST_F(FastUnloadTest,
MAYBE_WindowCloseAfterBeforeUnloadCrash) {
// Tests makes no sense in single-process mode since the renderer is hung.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kSingleProcess))
return;
NavigateToDataURL(BEFORE_UNLOAD_HTML, "beforeunload");
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index b840035..fee2cb7 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -26,7 +26,7 @@
// If a command line parameter specifying how long the upgrade check should
// be, we assume it is for testing and switch to using seconds instead of
// hours.
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
return !cmd_line.GetSwitchValueASCII(
switches::kCheckForUpdateIntervalSec).empty();
}
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 5b52b06..1143008 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -58,21 +58,21 @@
// Return the string that was passed as a value for the
// kCheckForUpdateIntervalSec switch.
std::string CmdLineInterval() {
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
return cmd_line.GetSwitchValueASCII(switches::kCheckForUpdateIntervalSec);
}
// Check if one of the outdated simulation switches was present on the command
// line.
bool SimulatingOutdated() {
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
return cmd_line.HasSwitch(switches::kSimulateOutdated) ||
cmd_line.HasSwitch(switches::kSimulateOutdatedNoAU);
}
// Check if any of the testing switches was present on the command line.
bool IsTesting() {
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+ const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
return cmd_line.HasSwitch(switches::kSimulateUpgrade) ||
cmd_line.HasSwitch(switches::kCheckForUpdateIntervalSec) ||
cmd_line.HasSwitch(switches::kSimulateCriticalUpdate) ||
@@ -169,7 +169,7 @@
Version(base::UTF16ToASCII(keystone_glue::CurrentlyInstalledVersion()));
#elif defined(OS_POSIX)
// POSIX but not Mac OS X: Linux, etc.
- CommandLine command_line(*CommandLine::ForCurrentProcess());
+ base::CommandLine command_line(*base::CommandLine::ForCurrentProcess());
command_line.AppendSwitch(switches::kProductVersion);
std::string reply;
if (!base::GetAppOutput(command_line, &reply)) {
@@ -189,7 +189,7 @@
is_auto_update_enabled_(true),
build_date_(base::GetBuildTime()),
weak_factory_(this) {
- CommandLine command_line(*CommandLine::ForCurrentProcess());
+ base::CommandLine command_line(*base::CommandLine::ForCurrentProcess());
// The different command line switches that affect testing can't be used
// simultaneously, if they do, here's the precedence order, based on the order
// of the if statements below:
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm
index 13f1404..7cb71cd 100644
--- a/chrome/browser/web_applications/web_app_mac.mm
+++ b/chrome/browser/web_applications/web_app_mac.mm
@@ -148,7 +148,7 @@
bool AppShimsDisabledForTest() {
// Disable app shims in tests because shims created in ~/Applications will not
// be cleaned up.
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType);
}
base::FilePath GetWritableApplicationsDirectory() {
@@ -236,7 +236,7 @@
if (!base::PathExists(shim_path))
return;
- CommandLine command_line(CommandLine::NO_PROGRAM);
+ base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(
app_mode::kLaunchedByChromeProcessId,
base::IntToString(base::GetCurrentProcId()));
@@ -859,7 +859,7 @@
[plist setObject:base::mac::FilePathToNSString(app_name)
forKey:base::mac::CFToNSCast(kCFBundleNameKey)];
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableAppsFileAssociations)) {
UpdateFileTypes(plist, file_handlers_info_);
}
@@ -1000,7 +1000,7 @@
base::Bind(&LaunchShimOnFileThread, shortcut_info, false));
}
-bool MaybeRebuildShortcut(const CommandLine& command_line) {
+bool MaybeRebuildShortcut(const base::CommandLine& command_line) {
if (!command_line.HasSwitch(app_mode::kAppShimError))
return false;
diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm
index e01b826..56f98bf 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -299,7 +299,7 @@
}
TEST_F(WebAppShortcutCreatorTest, FileHandlers) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableAppsFileAssociations);
extensions::FileHandlersInfo file_handlers_info;
extensions::FileHandlerInfo handler_0;
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index 00f7ac2..f9a6d76 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -108,7 +108,8 @@
base::string16 cmd_line_string;
if (base::win::ResolveShortcut(shortcut_file_name, NULL, &cmd_line_string)) {
cmd_line_string = L"program " + cmd_line_string;
- CommandLine shortcut_cmd_line = CommandLine::FromString(cmd_line_string);
+ base::CommandLine shortcut_cmd_line =
+ base::CommandLine::FromString(cmd_line_string);
return shortcut_cmd_line.HasSwitch(switches::kProfileDirectory) &&
shortcut_cmd_line.GetSwitchValuePath(switches::kProfileDirectory) ==
profile_path.BaseName() &&
@@ -195,13 +196,13 @@
// Working directory.
base::FilePath working_dir(chrome_exe.DirName());
- CommandLine cmd_line(CommandLine::NO_PROGRAM);
+ base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
shortcut_info.extension_id, shortcut_info.profile_path);
// TODO(evan): we rely on the fact that command_line_string() is
// properly quoted for a Windows command line. The method on
- // CommandLine should probably be renamed to better reflect that
+ // base::CommandLine should probably be renamed to better reflect that
// fact.
base::string16 wide_switches(cmd_line.GetCommandLineString());
@@ -338,7 +339,7 @@
HWND hwnd) {
DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
- CommandLine command_line =
+ base::CommandLine command_line =
ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
shortcut_info.extension_id,
shortcut_info.profile_path);
@@ -415,13 +416,14 @@
const std::string& extension_id,
const base::FilePath& profile_path) {
// Get the command-line to pass to the shim (e.g., "chrome.exe --app-id=...").
- CommandLine chrome_cmd_line = ShellIntegration::CommandLineArgsForLauncher(
- GURL(), extension_id, profile_path);
+ base::CommandLine chrome_cmd_line =
+ ShellIntegration::CommandLineArgsForLauncher(GURL(), extension_id,
+ profile_path);
chrome_cmd_line.AppendArg("%1");
// Get the command-line for calling the shim (e.g.,
// "app_shim [--chrome-sxs] -- --app-id=...").
- CommandLine shim_cmd_line(app_shim_path);
+ base::CommandLine shim_cmd_line(app_shim_path);
// If this is a canary build, launch the shim in canary mode.
if (InstallUtil::IsChromeSxSProcess())
shim_cmd_line.AppendSwitch(installer::switches::kChromeSxS);
@@ -470,7 +472,7 @@
if (!CreateAppShimBinary(app_shim_path))
return false;
- CommandLine shim_cmd_line(
+ base::CommandLine shim_cmd_line(
GetAppShimCommandLine(app_shim_path, extension_id, profile_path));
// TODO(mgiuca): Get the file type name from the manifest, or generate a
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc
index 3129e576..f4eaf9a6 100644
--- a/chrome/browser/web_resource/promo_resource_service.cc
+++ b/chrome/browser/web_resource/promo_resource_service.cc
@@ -44,14 +44,16 @@
};
GURL GetPromoResourceURL() {
- const std::string promo_server_url = CommandLine::ForCurrentProcess()->
- GetSwitchValueASCII(switches::kPromoServerURL);
+ const std::string promo_server_url =
+ base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kPromoServerURL);
return promo_server_url.empty() ?
NotificationPromo::PromoServerURL() : GURL(promo_server_url);
}
bool IsTest() {
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kPromoServerURL);
}
int GetCacheUpdateDelay() {
