Merge 273573 "Always call talk_base::InitializeSSL() in chromoti..."

remoting/client/plugin/chromoting_instance.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 "remoting/client/plugin/chromoting_instance.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 204 matching lines @@
   RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
 
   // Resister this instance to handle debug log messsages.
   RegisterLoggingInstance();
 
 #if defined(USE_OPENSSL)
   // Initialize random seed for libjingle. It's necessary only with OpenSSL.
   char random_seed[kRandomSeedSize];
   crypto::RandBytes(random_seed, sizeof(random_seed));
   talk_base::InitRandom(random_seed, sizeof(random_seed));
-#elif defined(USE_NSS)
+#else
+  // Libjingle's SSL implementation is not really used, but it has to be
+  // initialized for NSS builds to make sure that RNG is initialized in NSS,
+  // because libjingle uses it.
   talk_base::InitializeSSL();
-#endif  // defined(USE_NSS)
+#endif  // !defined(USE_OPENSSL)
 
   // Send hello message.
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->SetInteger("apiVersion", kApiVersion);
   data->SetString("apiFeatures", kApiFeatures);
   data->SetInteger("apiMinVersion", kApiMinMessagingVersion);
   data->SetString("requestedCapabilities", kRequestedCapabilities);
   data->SetString("supportedCapabilities", kSupportedCapabilities);
 
   PostLegacyJsonMessage("hello", data.Pass());
@@ skipping 888 matching lines @@
   pp::VarArrayBuffer array_buffer(buffer_size);
   void* data_ptr = array_buffer.Map();
   memcpy(data_ptr, buffer, buffer_size);
   array_buffer.Unmap();
   pp::VarDictionary data_dictionary;
   data_dictionary.Set(pp::Var("buffer"), array_buffer);
   PostChromotingMessage("mediaSourceData", data_dictionary);
 }
 
 }  // namespace remoting