Allowing WhispernetClient to be used during initialization

chrome/browser/copresence/chrome_whispernet_client.cc

 // 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.
 
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 26 matching lines @@
 }  // namespace
 
 // static
 const char ChromeWhispernetClient::kWhispernetProxyExtensionId[] =
     "bpfmnplchembfbdgieamdodgaencleal";
 
 // Public:
 
 ChromeWhispernetClient::ChromeWhispernetClient(
     content::BrowserContext* browser_context)
-    : browser_context_(browser_context), extension_loaded_(false) {
+    : browser_context_(browser_context),
+      event_router_(extensions::EventRouter::Get(browser_context)),
+      extension_loaded_(false) {
+  DCHECK(browser_context_);
+  DCHECK(event_router_);
 }
 
 ChromeWhispernetClient::~ChromeWhispernetClient() {
 }
 
 void ChromeWhispernetClient::Initialize(
     const copresence::SuccessCallback& init_callback) {
   DVLOG(3) << "Initializing whispernet proxy client.";
   init_callback_ = init_callback;
 
   extensions::ExtensionSystem* es =
       extensions::ExtensionSystem::Get(browser_context_);
   DCHECK(es);
   ExtensionService* service = es->extension_service();
   DCHECK(service);
   extensions::ComponentLoader* loader = service->component_loader();
   DCHECK(loader);
 
   // This callback is cancelled in Shutdown().
   extension_loaded_callback_ = base::Bind(
       &ChromeWhispernetClient::OnExtensionLoaded, base::Unretained(this));
 
   if (!loader->Exists(kWhispernetProxyExtensionId)) {
     DVLOG(3) << "Loading Whispernet proxy.";
     loader->Add(IDR_WHISPERNET_PROXY_MANIFEST,
                 base::FilePath(FILE_PATH_LITERAL("whispernet_proxy")));
   } else {
     init_callback_.Run(true);
   }
+
+  AudioConfiguration(GetDefaultAudioConfig());
 }
 
 void ChromeWhispernetClient::Shutdown() {
   extension_loaded_callback_.Reset();
   init_callback_.Reset();
   tokens_callback_.Reset();
   samples_callback_.Reset();
   db_callback_.Reset();
 }
 
-void AudioConfiguration(const copresence::config::AudioParamData& data,
-                        const copresence::SuccessCallback& init_callback) {
-}
-
 void ChromeWhispernetClient::EncodeToken(const std::string& token_str,
                                          copresence::AudioType type) {
-  DCHECK(extension_loaded_);
-  DCHECK(browser_context_);
-  DCHECK(extensions::EventRouter::Get(browser_context_));
-
   extensions::api::copresence_private::EncodeTokenParameters params;
   params.token.token = token_str;
   params.token.audible = type == copresence::AUDIBLE;
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnEncodeTokenRequest::kEventName,
       extensions::api::copresence_private::OnEncodeTokenRequest::Create(params),
       browser_context_));
 
-  extensions::EventRouter::Get(browser_context_)
-      ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
+  SendEventIfLoaded(event.Pass());
 }
 
 void ChromeWhispernetClient::DecodeSamples(copresence::AudioType type,
                                            const std::string& samples,
                                            const size_t token_length[2]) {
-  DCHECK(extension_loaded_);
-  DCHECK(browser_context_);
-  DCHECK(extensions::EventRouter::Get(browser_context_));
-
   extensions::api::copresence_private::DecodeSamplesParameters params;
   params.samples.assign(samples.begin(), samples.end());
   params.decode_audible =
       type == copresence::AUDIBLE || type == copresence::BOTH;
   params.decode_inaudible =
       type == copresence::INAUDIBLE || type == copresence::BOTH;
   params.audible_token_length = token_length[copresence::AUDIBLE];
   params.inaudible_token_length = token_length[copresence::INAUDIBLE];
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnDecodeSamplesRequest::kEventName,
       extensions::api::copresence_private::OnDecodeSamplesRequest::Create(
           params),
       browser_context_));
 
-  extensions::EventRouter::Get(browser_context_)
-      ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
+  SendEventIfLoaded(event.Pass());
 }
 
 void ChromeWhispernetClient::DetectBroadcast() {
-  DCHECK(extension_loaded_);
-  DCHECK(browser_context_);
-  DCHECK(extensions::EventRouter::Get(browser_context_));
-
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnDetectBroadcastRequest::kEventName,
       make_scoped_ptr(new base::ListValue()),
       browser_context_));
 
-  extensions::EventRouter::Get(browser_context_)
-      ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
+  SendEventIfLoaded(event.Pass());
 }
 
 void ChromeWhispernetClient::RegisterTokensCallback(
     const copresence::TokensCallback& tokens_callback) {
   tokens_callback_ = tokens_callback;
 }
 
 void ChromeWhispernetClient::RegisterSamplesCallback(
     const copresence::SamplesCallback& samples_callback) {
   samples_callback_ = samples_callback;
@@ skipping 18 matching lines @@
 }
 
 copresence::SuccessCallback ChromeWhispernetClient::GetInitializedCallback() {
   return extension_loaded_callback_;
 }
 
 // Private:
 
 void ChromeWhispernetClient::AudioConfiguration(
     const copresence::config::AudioParamData& params) {
-  DCHECK(browser_context_);
-  DCHECK(extensions::EventRouter::Get(browser_context_));
-
   extensions::api::copresence_private::AudioParameters audio_params;
 
   // We serialize AudioConfigData to a string and send it to the whispernet
   // nacl wrapper.
   const size_t params_size = sizeof(params);
   audio_params.param_data.resize(params_size);
   memcpy(vector_as_array(&audio_params.param_data), &params, params_size);
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnConfigAudio::kEventName,
       extensions::api::copresence_private::OnConfigAudio::Create(audio_params),
       browser_context_));
 
-  extensions::EventRouter::Get(browser_context_)
-      ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
+  SendEventIfLoaded(event.Pass());
+}
+
+void ChromeWhispernetClient::SendEventIfLoaded(
+    scoped_ptr<extensions::Event> event) {
+  if (extension_loaded_) {
+    event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId,
+                                            event.Pass());
+  } else {
+    queued_events_.push_back(event.Pass());
+  }
 }
 
 void ChromeWhispernetClient::OnExtensionLoaded(bool success) {
-  if (extension_loaded_) {
-    if (!init_callback_.is_null())
-      init_callback_.Run(success);
-    return;
+  if (!init_callback_.is_null())
+    init_callback_.Run(success);
+
+  DVLOG(3) << "Sending " << queued_events_.size()
+           << " queued requests to whispernet";
+  for (scoped_ptr<extensions::Event>& event : queued_events_) {
+    event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId,
+                                            event.Pass());
   }
+  queued_events_.clear();
 
-  // Our extension just got loaded, initialize whispernet.
   extension_loaded_ = true;
-
-  // This will fire another OnExtensionLoaded call once the initialization is
-  // done, which means we've initialized for realz, hence call the init
-  // callback.
-
-  AudioConfiguration(GetDefaultAudioConfig());

[Charlie, 2015/02/11 21:43:56]

Audio configuration can now be queued just like any other event. Thus the
wrapper doesn't have to call the init callback twice. This simplifies the tests
also.

 }