Revert 267030 "Build remoting for PNaCl"

trunk/src/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>
 
-#if defined(OS_NACL)
-#include <sys/mount.h>
-#include <nacl_io/nacl_io.h>
-#endif
-
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "crypto/random.h"
 #include "jingle/glue/thread_wrapper.h"
-#include "media/base/yuv_convert.h"
+#include "media/base/media.h"
 #include "net/socket/ssl_server_socket.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/dev/url_util_dev.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/rect.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/client_config.h"
@@ skipping 166 matching lines @@
       initialized_(false),
       plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
       context_(plugin_task_runner_.get()),
       input_tracker_(&mouse_input_filter_),
       key_mapper_(&input_tracker_),
       normalizing_input_filter_(CreateNormalizingInputFilter(&key_mapper_)),
       input_handler_(this, normalizing_input_filter_.get()),
       use_async_pin_dialog_(false),
       use_media_source_rendering_(false),
       weak_factory_(this) {
-#if defined(OS_NACL)
-  // In NaCl global resources need to be initialized differently because they
-  // are not shared with Chrome.
-  thread_task_runner_handle_.reset(
-      new base::ThreadTaskRunnerHandle(plugin_task_runner_));
-  thread_wrapper_.reset(
-      new jingle_glue::JingleThreadWrapper(plugin_task_runner_));
-  media::InitializeCPUSpecificYUVConversions();
-#else
-  jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
-#endif
-
-#if defined(OS_NACL)
-  nacl_io_init_ppapi(pp_instance, pp::Module::Get()->get_browser_interface());
-  mount("", "/etc", "memfs", 0, "");
-  mount("", "/usr", "memfs", 0, "");
-#endif
-
   RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
   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));
@@ skipping 34 matching lines @@
 }
 
 bool ChromotingInstance::Init(uint32_t argc,
                               const char* argn[],
                               const char* argv[]) {
   CHECK(!initialized_);
   initialized_ = true;
 
   VLOG(1) << "Started ChromotingInstance::Init";
 
-  // Check that the calling content is part of an app or extension. This is only
-  // necessary for non-PNaCl version of the plugin. Also PPB_URLUtil_Dev doesn't
-  // work in NaCl at the moment so the check fails in NaCl builds.
-#if !defined(OS_NACL)
+  // Check to make sure the media library is initialized.
+  // http://crbug.com/91521.
+  if (!media::IsMediaLibraryInitialized()) {
+    LOG(ERROR) << "Media library not initialized.";
+    return false;
+  }
+
+  // Check that the calling content is part of an app or extension.
   if (!IsCallerAppOrExtension()) {
     LOG(ERROR) << "Not an app or extension";
     return false;
   }
-#endif
 
   // Start all the threads.
   context_.Start();
 
   return true;
 }
 
 void ChromotingInstance::HandleMessage(const pp::Var& message) {
   if (!message.is_string()) {
     LOG(ERROR) << "Received a message that is not a string.";
@@ skipping 49 matching lines @@
   } else if (method == "allowMouseLock") {
     HandleAllowMouseLockMessage();
   } else if (method == "enableMediaSourceRendering") {
     HandleEnableMediaSourceRendering();
   }
 }
 
 void ChromotingInstance::DidChangeFocus(bool has_focus) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
-  if (!IsConnected())
-    return;
-
   input_handler_.DidChangeFocus(has_focus);
 }
 
 void ChromotingInstance::DidChangeView(const pp::View& view) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   plugin_view_ = view;
   mouse_input_filter_.set_input_size(
       webrtc::DesktopSize(view.GetRect().width(), view.GetRect().height()));
 
@@ skipping 262 matching lines @@
     }
   }
 
   ConnectWithConfig(config, local_jid);
 }
 
 void ChromotingInstance::ConnectWithConfig(const ClientConfig& config,
                                            const std::string& local_jid) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
+  jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
+
   if (use_media_source_rendering_) {
     video_renderer_.reset(new MediaSourceVideoRenderer(this));
   } else {
     view_.reset(new PepperView(this, &context_));
     view_weak_factory_.reset(
         new base::WeakPtrFactory<FrameConsumer>(view_.get()));
 
     // SoftwareVideoRenderer runs on a separate thread so for now we wrap
     // PepperView with a ref-counted proxy object.
     scoped_refptr<FrameConsumerProxy> consumer_proxy =
@@ skipping 481 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