Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 7576005: Revert 95414 - Future proof against things like http://crbug.com/91521 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/client_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
===================================================================
--- remoting/client/plugin/chromoting_instance.cc (revision 95414)
+++ remoting/client/plugin/chromoting_instance.cc (working copy)
@@ -21,7 +21,6 @@
// crbug.com/74951
#include "content/renderer/p2p/ipc_network_manager.h"
#include "content/renderer/p2p/ipc_socket_factory.h"
-#include "media/base/media.h"
#include "ppapi/c/dev/ppb_query_policy_dev.h"
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/input_event.h"
@@ -122,9 +121,7 @@
// before we can call Detach() on |view_proxy_|.
context_.Stop();
- if (view_proxy_.get()) {
- view_proxy_->Detach();
- }
+ view_proxy_->Detach();
}
bool ChromotingInstance::Init(uint32_t argc,
@@ -135,13 +132,6 @@
VLOG(1) << "Started ChromotingInstance::Init";
- // Check to make sure the media library is initialized.
- // http://crbug.com/91521.
- if (!media::IsMediaLibraryInitialized()) {
- logger_.Log(logging::LOG_ERROR, "Media library not initialized.");
- return false;
- }
-
// Start all the threads.
context_.Start();
« no previous file with comments | « remoting/client/client_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698