Allocate SocketController lazily.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 374 matching lines @@
       extensions_enabled_(extensions_enabled),
       show_extensions_prompts_(true),
       ready_(false),
       toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       menu_manager_(profile),
       app_notification_manager_(new AppNotificationManager(profile)),
       permissions_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       apps_promo_(profile->GetPrefs()),
       event_routers_initialized_(false),
       extension_warnings_(profile),
-      socket_controller_(new extensions::SocketController()),
+      socket_controller_(NULL),
       tracker_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Figure out if extension installation should be enabled.
   if (command_line->HasSwitch(switches::kDisableExtensions)) {
     extensions_enabled_ = false;
   } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
     extensions_enabled_ = false;
   }
 
@@ skipping 68 matching lines @@
   ProviderCollection::const_iterator i;
   for (i = external_extension_providers_.begin();
        i != external_extension_providers_.end(); ++i) {
     ExternalExtensionProviderInterface* provider = i->get();
     provider->ServiceShutdown();
   }
 
   // TODO(miket): if we find ourselves adding more and more per-API
   // controllers, we should manage them all with an
   // APIControllerController (still working on that name).
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      new DeleteTask<extensions::SocketController>(socket_controller_));
+  if (socket_controller_) {
+    // If this check failed, then a unit test was using sockets but didn't
+    // provide the IO thread message loop needed for those sockets to do their
+    // job (including destroying themselves at shutdown).
+    DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::IO));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        new DeleteTask<extensions::SocketController>(socket_controller_));
+  }
 }
 
 void ExtensionService::InitEventRoutersAfterImport() {
   registrar_.Add(this, chrome::NOTIFICATION_IMPORT_FINISHED,
                  content::Source<Profile>(profile_));
 }
 
 void ExtensionService::InitEventRouters() {
   if (event_routers_initialized_)
     return;
@@ skipping 2085 matching lines @@
                                      const ExtensionResource &resource,
                                      int index) {
   // If the image failed to load (e.g. if the resource being loaded was empty)
   // use the standard application icon.
   if (!image || image->isNull())
     image = ExtensionIconSource::LoadImageByResourceId(IDR_APP_DEFAULT_ICON);
 
   shortcut_info_.favicon = *image;
   web_app::CreateShortcut(profile_->GetPath(), shortcut_info_);
 }
+
+extensions::SocketController* ExtensionService::socket_controller() {
+  // TODO(miket): Find a better place for SocketController to live. It needs
+  // to be scoped such that it can be created and destroyed on the IO thread.
+  //
+  // To coexist with certain unit tests that don't have an IO thread message
+  // loop available at ExtensionService shutdown, we lazy-initialize this
+  // object so that those cases neither create nor destroy a SocketController.
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (!socket_controller_) {
+    socket_controller_ = new extensions::SocketController();
+  }
+  return socket_controller_;
+}