Update from https://crrev.com/306655

base/test/test_timeouts.cc

Index: base/test/test_timeouts.cc
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index c84cd3812e80f0eab1724de8757d3bd47df01dc1..66ae85eb0d8a4e930dca55b6ad04a37ef79b6de4 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -41,9 +41,9 @@ const int kAlmostInfiniteTimeoutMs = 100000000;
 // 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);