diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/base/linux_util.cc | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/base/linux_util.cc')
| -rw-r--r-- | chromium/base/linux_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/linux_util.cc b/chromium/base/linux_util.cc index d6cd5040320..d94588f98c6 100644 --- a/chromium/base/linux_util.cc +++ b/chromium/base/linux_util.cc @@ -37,7 +37,7 @@ class LinuxDistroHelper { public: // Retrieves the Singleton. static LinuxDistroHelper* GetInstance() { - return Singleton<LinuxDistroHelper>::get(); + return base::Singleton<LinuxDistroHelper>::get(); } // The simple state machine goes from: @@ -106,7 +106,7 @@ std::string GetLinuxDistro() { argv.push_back("lsb_release"); argv.push_back("-d"); std::string output; - base::GetAppOutput(CommandLine(argv), &output); + GetAppOutput(CommandLine(argv), &output); if (output.length() > 0) { // lsb_release -d should return: Description:<tab>Distro Info const char field[] = "Description:\t"; @@ -124,8 +124,8 @@ std::string GetLinuxDistro() { void SetLinuxDistro(const std::string& distro) { std::string trimmed_distro; - base::TrimWhitespaceASCII(distro, base::TRIM_ALL, &trimmed_distro); - base::strlcpy(g_linux_distro, trimmed_distro.c_str(), kDistroSize); + TrimWhitespaceASCII(distro, TRIM_ALL, &trimmed_distro); + strlcpy(g_linux_distro, trimmed_distro.c_str(), kDistroSize); } pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, |