Update from https://crrev.com/306655
Includes updates to ui/ and mojo/services for cc and gpu changes and
a minor update to a unit test in sky/ for skia interface changes.
Review URL: https://codereview.chromium.org/761903003
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index c84cd38..66ae85e 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -41,9 +41,9 @@
// by kTimeoutMultiplier.
void InitializeTimeout(const char* switch_name, int min_value, int* value) {
DCHECK(value);
- if (CommandLine::ForCurrentProcess()->HasSwitch(switch_name)) {
- std::string string_value(
- CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switch_name));
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switch_name)) {
+ std::string string_value(base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII(switch_name));
int timeout;
base::StringToInt(string_value, &timeout);
*value = std::max(*value, timeout);
