Fix "unreachable code" warnings (MSVC warning 4702) in chrome/browser/.

chrome/browser/upgrade_detector_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/upgrade_detector_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/build_time.h"
@@ skipping 155 matching lines @@
       // We got a valid build date simulation so use it and check for upgrades.
       build_date_ = maybe_build_time;
       StartTimerForUpgradeCheck();
     } else {
       // Without a valid date, we simulate that we are already outdated...
       UpgradeDetected(UPGRADE_NEEDED_OUTDATED_INSTALL);
     }
     return;
   }
 
-  // Windows: only enable upgrade notifications for official builds.
-  // Mac: only enable them if the updater (Keystone) is present.
-  // Linux (and other POSIX): always enable regardless of branding.
   base::Closure start_upgrade_check_timer_task =
       base::Bind(&UpgradeDetectorImpl::StartTimerForUpgradeCheck,
                  weak_factory_.GetWeakPtr());
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+
+#if defined(OS_WIN)
+  // Only enable upgrade notifications for official builds.  Chromium has no
+  // upgrade channel.
+#if defined(GOOGLE_CHROME_BUILD)
   // On Windows, there might be a policy preventing updates, so validate
   // updatability, and then call StartTimerForUpgradeCheck appropriately.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DetectUpdatability,
                                      start_upgrade_check_timer_task,
                                      &is_unstable_channel_));
-  return;
-#elif defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
-  return;  // Chromium has no upgrade channel.
-#elif defined(OS_MACOSX)
+#endif
+#else
+#if defined(OS_MACOSX)
+  // Only enable upgrade notifications if the updater (Keystone) is present.
   if (!keystone_glue::KeystoneEnabled())
-    return;  // Keystone updater not enabled.
-#elif !defined(OS_POSIX)
+    return;
+#elif defined(OS_POSIX)
+  // Always enable upgrade notifications regardless of branding.
+#else
   return;
 #endif
-
   // Check whether the build is an unstable channel before starting the timer.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&CheckForUnstableChannel,
                                      start_upgrade_check_timer_task,
                                      &is_unstable_channel_));
 
   // Start tracking network time updates.
   network_time_tracker_.Start();
+#endif
 }
 
 UpgradeDetectorImpl::~UpgradeDetectorImpl() {
 }
 
 // Static
 // This task checks the currently running version of Chrome against the
 // installed version. If the installed version is newer, it calls back
 // UpgradeDetectorImpl::UpgradeDetected using a weak pointer so that it can
 // be interrupted from the UI thread.
@@ skipping 206 matching lines @@
 
 // static
 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
   return Singleton<UpgradeDetectorImpl>::get();
 }
 
 // static
 UpgradeDetector* UpgradeDetector::GetInstance() {
   return UpgradeDetectorImpl::GetInstance();
 }