Fix unreachable code after refs/heads/master@{#512687}

Change-Id: Iab66d40beb60e9d232d977916ae69a56d35f65b8
Reviewed-on: https://chromium-review.googlesource.com/747274
Commit-Queue: Bo <boliu@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512928}

content/browser/gpu/browser_gpu_channel_host_factory.cc

@@ -38,11 +38,13 @@
 
 namespace content {
 
+#if defined(OS_ANDROID)
 namespace {
 void TimedOut() {
   LOG(FATAL) << "Timed out waiting for GPU channel.";
 }
 }  // namespace
+#endif  // OS_ANDROID
 
 BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
 
@@ -351,15 +353,12 @@ void BrowserGpuChannelHostFactory::GpuChannelEstablished() {
 
 void BrowserGpuChannelHostFactory::RestartTimeout() {
   DCHECK(IsMainThread());
+// Only implement timeout on Android, which does not have a software fallback.
 #if defined(OS_ANDROID)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableTimeoutsForProfiling)) {
     return;
   }
-#else
-  // Only implement timeout on Android, which does not have a software fallback.
-  return;
-#endif
 
   if (!pending_request_)
     return;
@@ -376,6 +375,7 @@ void BrowserGpuChannelHostFactory::RestartTimeout() {
   timeout_.Start(FROM_HERE,
                  base::TimeDelta::FromSeconds(kGpuChannelTimeoutInSeconds),
                  base::Bind(&TimedOut));
+#endif  // OS_ANDROID
 }
 
 // static