chrome.bluetooth API improvements.

extensions/browser/api/api_resource_manager.h

 // Copyright 2014 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.
 
 #ifndef EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_
 #define EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 namespace api {
+class BluetoothSocketApiFunction;
+class BluetoothSocketEventDispatcher;
 class SerialEventDispatcher;
 }
 
 namespace core_api {
 class TCPServerSocketEventDispatcher;
 class TCPSocketEventDispatcher;
 class UDPSocketEventDispatcher;
 }
 
 // An ApiResourceManager manages the lifetime of a set of resources that
@@ skipping 107 matching lines @@
         ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
         data_->InitiateExtensionSuspendedCleanup(host->extension_id());
         break;
       }
     }
   }
 
  private:
   // TODO(rockot): ApiResourceData could be moved out of ApiResourceManager and
   // we could avoid maintaining a friends list here.
+  friend class BluetoothAPI;
+  friend class api::BluetoothSocketApiFunction;
+  friend class api::BluetoothSocketEventDispatcher;
   friend class api::SerialEventDispatcher;
   friend class core_api::TCPServerSocketEventDispatcher;
   friend class core_api::TCPSocketEventDispatcher;
   friend class core_api::UDPSocketEventDispatcher;
   friend class BrowserContextKeyedAPIFactory<ApiResourceManager<T> >;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return T::service_name(); }
 
   static const bool kServiceHasOwnInstanceInIncognito = true;
@@ skipping 43 matching lines @@
       DCHECK_CURRENTLY_ON(thread_id_);
       return GetOwnedResource(extension_id, api_resource_id);
     }
 
     base::hash_set<int>* GetResourceIds(const std::string& extension_id) {
       DCHECK_CURRENTLY_ON(thread_id_);
       return GetOwnedResourceIds(extension_id);
     }
 
     void InitiateExtensionUnloadedCleanup(const std::string& extension_id) {
-      content::BrowserThread::PostTask(
-          thread_id_,
-          FROM_HERE,
-          base::Bind(&ApiResourceData::CleanupResourcesFromUnloadedExtension,
-                     this,
-                     extension_id));
+      if (content::BrowserThread::CurrentlyOn(thread_id_)) {
+        CleanupResourcesFromUnloadedExtension(extension_id);
+      } else {
+        content::BrowserThread::PostTask(
+            thread_id_,
+            FROM_HERE,
+            base::Bind(&ApiResourceData::CleanupResourcesFromUnloadedExtension,
+                       this,
+                       extension_id));
+      }
     }
 
     void InitiateExtensionSuspendedCleanup(const std::string& extension_id) {
-      content::BrowserThread::PostTask(
-          thread_id_,
-          FROM_HERE,
-          base::Bind(&ApiResourceData::CleanupResourcesFromSuspendedExtension,
-                     this,
-                     extension_id));
+      if (content::BrowserThread::CurrentlyOn(thread_id_)) {
+        CleanupResourcesFromSuspendedExtension(extension_id);
+      } else {
+        content::BrowserThread::PostTask(
+            thread_id_,
+            FROM_HERE,
+            base::Bind(&ApiResourceData::CleanupResourcesFromSuspendedExtension,
+                       this,
+                       extension_id));
+      }
     }
 
     void InititateCleanup() {
-      content::BrowserThread::PostTask(
-          thread_id_, FROM_HERE, base::Bind(&ApiResourceData::Cleanup, this));
+      if (content::BrowserThread::CurrentlyOn(thread_id_)) {
+        Cleanup();
+      } else {
+        content::BrowserThread::PostTask(
+            thread_id_, FROM_HERE, base::Bind(&ApiResourceData::Cleanup, this));
+      }
     }
 
    private:
     friend class base::RefCountedThreadSafe<ApiResourceData>;
 
     virtual ~ApiResourceData() {}
 
     T* GetOwnedResource(const std::string& extension_id, int api_resource_id) {
       linked_ptr<T> ptr = api_resource_map_[api_resource_id];
       T* resource = ptr.get();
@@ skipping 74 matching lines @@
   };
 
   content::BrowserThread::ID thread_id_;
   content::NotificationRegistrar registrar_;
   scoped_refptr<ApiResourceData> data_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_API_RESOURCE_MANAGER_H_