Revert 148856 (broke mac, asan, linux cros bots)

chrome/browser/extensions/test_extension_system.cc

Index: chrome/browser/extensions/test_extension_system.cc
===================================================================
--- chrome/browser/extensions/test_extension_system.cc	(revision 148858)
+++ chrome/browser/extensions/test_extension_system.cc	(working copy)
@@ -19,10 +19,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/value_store/testing_value_store.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/public/browser/browser_thread.h"
 
-using content::BrowserThread;
-
 namespace extensions {
 
 TestExtensionSystem::TestExtensionSystem(Profile* profile)
@@ -46,17 +43,6 @@
   alarm_manager_.reset(new AlarmManager(profile_, now));
 }
 
-void TestExtensionSystem::CreateSocketManager() {
-  // Note that we're intentionally creating the socket manager on the wrong
-  // thread (not the IO thread). This is because we don't want to presume or
-  // require that there be an IO thread in a lightweight test context. If we do
-  // need thread-specific behavior someday, we'll probably need something like
-  // CreateSocketManagerOnThreadForTesting(thread_id). But not today.
-  BrowserThread::ID id;
-  DCHECK(BrowserThread::GetCurrentThreadIdentifier(&id));
-  socket_manager_.reset(new ApiResourceManager<Socket>(id));
-}
-
 ExtensionService* TestExtensionSystem::CreateExtensionService(
     const CommandLine* command_line,
     const FilePath& install_directory,
@@ -152,7 +138,7 @@
 }
 
 ApiResourceManager<Socket>*TestExtensionSystem::socket_manager() {
-  return socket_manager_.get();
+  return NULL;
 }
 
 ApiResourceManager<UsbDeviceResource>*