Fix PepperFlashSettingsManager::Core initialization.

chrome/browser/pepper_flash_settings_manager.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/pepper_flash_settings_manager.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
@@ skipping 18 matching lines @@
 
 using content::BrowserThread;
 
 class PepperFlashSettingsManager::Core
     : public IPC::Listener,
       public base::RefCountedThreadSafe<Core, BrowserThread::DeleteOnIOThread> {
  public:
   Core(PepperFlashSettingsManager* manager,
        content::BrowserContext* browser_context);
 
+  void Initialize();
   // Stops sending notifications to |manager_| and sets it to NULL.
   void Detach();
 
   void DeauthorizeContentLicenses(uint32 request_id);
   void GetPermissionSettings(
       uint32 request_id,
       PP_Flash_BrowserOperations_SettingType setting_type);
   void SetDefaultPermission(
       uint32 request_id,
       PP_Flash_BrowserOperations_SettingType setting_type,
@@ skipping 38 matching lines @@
     // Used by SET_DEFAULT_PERMISSION.
     PP_Flash_BrowserOperations_Permission permission;
     bool clear_site_specific;
 
     // Used by SET_SITE_PERMISSION.
     ppapi::FlashSiteSettings sites;
   };
 
   virtual ~Core();
 
-  void Initialize();
   void ConnectToChannel(bool success, const IPC::ChannelHandle& handle);
 
+  void InitializeOnIOThread();
   void DeauthorizeContentLicensesOnIOThread(uint32 request_id);
   void GetPermissionSettingsOnIOThread(
       uint32 request_id,
       PP_Flash_BrowserOperations_SettingType setting_type);
   void SetDefaultPermissionOnIOThread(
       uint32 request_id,
       PP_Flash_BrowserOperations_SettingType setting_type,
       PP_Flash_BrowserOperations_Permission permission,
       bool clear_site_specific);
   void SetSitePermissionOnIOThread(
@@ skipping 62 matching lines @@
 
 PepperFlashSettingsManager::Core::Core(PepperFlashSettingsManager* manager,
                                        content::BrowserContext* browser_context)
     : manager_(manager),
       initialized_(false),
       detached_(false),
       browser_context_path_(browser_context->GetPath()),
       plugin_prefs_(PluginPrefs::GetForProfile(
           Profile::FromBrowserContext(browser_context))) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                          base::Bind(&Core::Initialize, this));
 }
 
 PepperFlashSettingsManager::Core::~Core() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
+void PepperFlashSettingsManager::Core::Initialize() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&Core::InitializeOnIOThread, this));
+}
+
 void PepperFlashSettingsManager::Core::Detach() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   manager_ = NULL;
   // This call guarantees that one ref is retained until |detached_| is set to
   // true. This is important. Otherwise, if the ref count drops to zero on the
   // UI thread (which posts a task to delete this object on the I/O thread)
   // while the I/O thread doesn't know about it, methods on the I/O thread might
   // increase the ref count again and cause double deletion.
   BrowserThread::PostTask(
@@ skipping 64 matching lines @@
 }
 
 void PepperFlashSettingsManager::Core::OnChannelError() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (detached_)
     return;
 
   NotifyErrorFromIOThread();
 }
 
-void PepperFlashSettingsManager::Core::Initialize() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(!detached_);
-  DCHECK(!initialized_);
-
-  webkit::WebPluginInfo plugin_info;
-  if (!PepperFlashSettingsManager::IsPepperFlashInUse(plugin_prefs_.get(),
-                                                      &plugin_info)) {
-    NotifyErrorFromIOThread();
-    return;
-  }
-
-  FilePath profile_path =
-      browser_context_path_.Append(content::kPepperDataDirname);
-#if defined(OS_WIN)
-  plugin_data_path_ = profile_path.Append(plugin_info.name);
-#else
-  plugin_data_path_ = profile_path.Append(UTF16ToUTF8(plugin_info.name));
-#endif
-
-  helper_ = content::PepperFlashSettingsHelper::Create();
-  content::PepperFlashSettingsHelper::OpenChannelCallback callback =
-      base::Bind(&Core::ConnectToChannel, this);
-  helper_->OpenChannelToBroker(plugin_info.path, callback);
-}
-
 void PepperFlashSettingsManager::Core::ConnectToChannel(
     bool success,
     const IPC::ChannelHandle& handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (detached_)
     return;
 
   DCHECK(!initialized_);
   DCHECK(!channel_.get());
 
@@ skipping 32 matching lines @@
       case SET_SITE_PERMISSION:
         SetSitePermissionOnIOThread(iter->id, iter->setting_type, iter->sites);
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 }
 
+void PepperFlashSettingsManager::Core::InitializeOnIOThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK(!initialized_);
+
+  if (detached_)
+    return;
+
+  webkit::WebPluginInfo plugin_info;
+  if (!PepperFlashSettingsManager::IsPepperFlashInUse(plugin_prefs_.get(),
+                                                      &plugin_info)) {
+    NotifyErrorFromIOThread();
+    return;
+  }
+
+  FilePath profile_path =
+      browser_context_path_.Append(content::kPepperDataDirname);
+#if defined(OS_WIN)
+  plugin_data_path_ = profile_path.Append(plugin_info.name);
+#else
+  plugin_data_path_ = profile_path.Append(UTF16ToUTF8(plugin_info.name));
+#endif
+
+  helper_ = content::PepperFlashSettingsHelper::Create();
+  content::PepperFlashSettingsHelper::OpenChannelCallback callback =
+      base::Bind(&Core::ConnectToChannel, this);
+  helper_->OpenChannelToBroker(plugin_info.path, callback);
+}
+
 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnIOThread(
     uint32 request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (detached_)
     return;
 
   if (!initialized_) {
     PendingRequest request;
     request.id = request_id;
     request.type = DEAUTHORIZE_CONTENT_LICENSES;
@@ skipping 394 matching lines @@
   uint32 id = GetNextRequestId();
   core_->SetSitePermission(id, setting_type, sites);
   return id;
 }
 
 uint32 PepperFlashSettingsManager::GetNextRequestId() {
   return next_request_id_++;
 }
 
 void PepperFlashSettingsManager::EnsureCoreExists() {
-  if (!core_.get())
+  if (!core_.get()) {
     core_ = new Core(this, browser_context_);
+    core_->Initialize();
+  }
 }
 
 void PepperFlashSettingsManager::OnError() {
   if (core_.get()) {
     core_->Detach();
     core_ = NULL;
   } else {
     NOTREACHED();
   }
 }