Don't inhibit checking for pending updates for domain-enrolled machines.

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 109 matching lines @@
   // upgraded in the background.
   base::FilePath exe_path;
   if (!PathService::Get(base::DIR_EXE, &exe_path)) {
     NOTREACHED() << "Failed to find executable path";
     return false;
   }
 
   return !InstallUtil::IsPerUserInstall(exe_path.value().c_str());
 }
 
-// This task checks the update policy and calls back the task only if the
-// system is not enrolled in a domain (i.e., not in an enterprise environment).
-// It also identifies if autoupdate is enabled and whether we are running an
-// unstable channel. |is_auto_update_enabled| can be NULL.
+// Sets |is_unstable_channel| to true if the current chrome is on the dev or
+// canary channels. Sets |is_auto_update_enabled| to true if Google Update will
+// update the current chrome. Unconditionally posts |callback_task| to the UI
+// thread to continue processing.
 void DetectUpdatability(const base::Closure& callback_task,
                         bool* is_unstable_channel,
                         bool* is_auto_update_enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::string16 app_guid = installer::GetAppGuidForUpdates(IsSystemInstall());
   DCHECK(!app_guid.empty());
   // Don't try to turn on autoupdate when we failed previously.
   if (is_auto_update_enabled) {
     *is_auto_update_enabled =
         GoogleUpdateSettings::AreAutoupdatesEnabled(app_guid);
   }
   *is_unstable_channel = IsUnstableChannel();
-  // Don't show the update bubbles to entreprise users (i.e., on a domain).
-  if (!base::win::IsEnrolledToDomain())
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_task);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_task);
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace
 
 UpgradeDetectorImpl::UpgradeDetectorImpl()
     : weak_factory_(this),
       is_unstable_channel_(false),
       is_auto_update_enabled_(true),
       build_date_(base::GetBuildTime()) {
@@ skipping 200 matching lines @@
 bool UpgradeDetectorImpl::DetectOutdatedInstall() {
   // Don't show the bubble if we have a brand code that is NOT organic, unless
   // an outdated build is being simulated by command line switches.
   static bool simulate_outdated = SimulatingOutdated();
   if (!simulate_outdated) {
     std::string brand;
     if (google_util::GetBrand(&brand) && !google_util::IsOrganic(brand))
       return false;
 
 #if defined(OS_WIN)
+    // Don't show the update bubbles to entreprise users (i.e., on a domain).
+    if (base::win::IsEnrolledToDomain())
+      return false;
+
     // On Windows, we don't want to warn about outdated installs when the
     // machine doesn't support SSE2, it's been deprecated starting with M35.
     if (!base::CPU().has_sse2())
       return false;
 #endif
   }
 
   base::Time network_time;
   base::TimeDelta uncertainty;
   if (!network_time_tracker_.GetNetworkTime(base::TimeTicks::Now(),
@@ skipping 98 matching lines @@
 
 // static
 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() {
   return Singleton<UpgradeDetectorImpl>::get();
 }
 
 // static
 UpgradeDetector* UpgradeDetector::GetInstance() {
   return UpgradeDetectorImpl::GetInstance();
 }