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

chrome/browser/extensions/test_extension_system.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/extensions/test_extension_system.h"
 
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_pref_value_map_factory.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/message_service.h"
 #include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #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)
     : profile_(profile),
       info_map_(new ExtensionInfoMap()) {
 }
 
 TestExtensionSystem::~TestExtensionSystem() {
 }
 
 void TestExtensionSystem::Shutdown() {
   extension_process_manager_.reset();
 }
 
 void TestExtensionSystem::CreateExtensionProcessManager() {
   extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
 }
 
 void TestExtensionSystem::CreateAlarmManager(
     AlarmManager::TimeProvider now) {
   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,
     bool autoupdate_enabled) {
   bool extensions_disabled =
       command_line && command_line->HasSwitch(switches::kDisableExtensions);
 
   // Note that the GetPrefs() creates a TestingPrefService, therefore
   // the extension controlled pref values set in extension_prefs_
   // are not reflected in the pref service. One would need to
@@ skipping 75 matching lines @@
 RulesRegistryService* TestExtensionSystem::rules_registry_service() {
   return NULL;
 }
 
 ApiResourceManager<SerialConnection>*
 TestExtensionSystem::serial_connection_manager() {
   return NULL;
 }
 
 ApiResourceManager<Socket>*TestExtensionSystem::socket_manager() {
-  return socket_manager_.get();
+  return NULL;
 }
 
 ApiResourceManager<UsbDeviceResource>*
 TestExtensionSystem::usb_device_resource_manager() {
   return NULL;
 }
 
 // static
 ProfileKeyedService* TestExtensionSystem::Build(Profile* profile) {
   return new TestExtensionSystem(profile);
 }
 
 }  // namespace extensions