Purge Logo/WebstoreSignal.

chrome/browser/web_resource/notification_promo.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/web_resource/notification_promo.h"
 
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
   return "chromeos";
 #elif defined(OS_LINUX)
   return "linux";
 #else
   return "none";
 #endif
 }
 
 // Returns a string suitable for the Promo Server URL 'dist' value.
 const char* ChannelString() {
+  // GetChannel hits the registry on Windows. See http://crbug.com/70898.
+  base::ThreadRestrictions::ScopedAllowIO allow_io;

[Dan Beam, 2012/06/08 18:49:47]

presubmit is angry at you for this ^, also

#if defined(OS_WIN)
  base::ThreadRestrictions::ScopedAllowIO allow_io;
#endif

[achuithb, 2012/06/08 22:29:08]

I'll add the OS_WIN #define. The ScopedAllowIO was not introduced by this patch,
but was moved from PromoResourceService.

I thought about this and it's going to be a decent amount of work to eliminate
this ScopedAllowIO. channel is needed by GetPromoServerUrl(), which is needed in
the ctor of WebResourceService. We'd need to refactor all that stuff to take
callbacks, and I'd rather not do that now.

[Dan Beam, 2012/06/08 22:34:54]

I still think you should move this #ifdef inside
chrome::VersionInfo::GetChannel().

[Robert Sesek, 2012/06/08 22:35:53]

I disagree with this. Clients of this function should know explicitly that it
does IO.

   const chrome::VersionInfo::Channel channel =
-      PromoResourceService::GetChannel();
+      chrome::VersionInfo::GetChannel();
   switch (channel) {
     case chrome::VersionInfo::CHANNEL_CANARY:
       return "canary";
     case chrome::VersionInfo::CHANNEL_DEV:
       return "dev";
     case chrome::VersionInfo::CHANNEL_BETA:
       return "beta";
     case chrome::VersionInfo::CHANNEL_STABLE:
       return "stable";
     default:
@@ skipping 258 matching lines @@
   if (group_ < initial_segment_)
     return start_;
   return start_ +
       std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
       * time_slice_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }