Purge Logo/WebstoreSignal.

chrome/browser/web_resource/notification_promo.cc

Index: chrome/browser/web_resource/notification_promo.cc
===================================================================
--- chrome/browser/web_resource/notification_promo.cc	(revision 140512)
+++ chrome/browser/web_resource/notification_promo.cc	(working copy)
@@ -50,8 +50,10 @@
 
 // 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";