summaryrefslogtreecommitdiffstats
path: root/chromeos/system
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2014-12-22 12:54:48 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-22 20:55:44 +0000
commitf38ab65ea940c2c3bc56a1eab38d61a1802a79cd (patch)
tree30caccf8bd86c71fab184578f1c5dcbdd98aeb2d /chromeos/system
parent9a3381c7761c03a5aba2a7703a759dcc9b8b6d8b (diff)
downloadchromium_src-f38ab65ea940c2c3bc56a1eab38d61a1802a79cd.zip
chromium_src-f38ab65ea940c2c3bc56a1eab38d61a1802a79cd.tar.gz
chromium_src-f38ab65ea940c2c3bc56a1eab38d61a1802a79cd.tar.bz2
Make callers of CommandLine use it via the base:: namespace.
Covers android_webview/, ash/, athena/, chromeos/. BUG=422426 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/825473002 Cr-Commit-Position: refs/heads/master@{#309459}
Diffstat (limited to 'chromeos/system')
-rw-r--r--chromeos/system/statistics_provider.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc
index e533dd7..7ac8863 100644
--- a/chromeos/system/statistics_provider.cc
+++ b/chromeos/system/statistics_provider.cc
@@ -62,7 +62,7 @@ const char kVpdDelim[] = "\n";
const int kTimeoutSecs = 3;
// The location of OEM manifest file used to trigger OOBE flow for kiosk mode.
-const CommandLine::CharType kOemManifestFilePath[] =
+const base::CommandLine::CharType kOemManifestFilePath[] =
FILE_PATH_LITERAL("/usr/share/oem/oobe/manifest.json");
} // namespace
@@ -298,7 +298,7 @@ void StatisticsProviderImpl::LoadMachineStatistics(bool load_oem_manifest) {
if (load_oem_manifest) {
// If kAppOemManifestFile switch is specified, load OEM Manifest file.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kAppOemManifestFile)) {
LoadOemManifestFromFile(
command_line->GetSwitchValuePath(switches::kAppOemManifestFile));