Pepper: specify the security origin when enumerating media devices.

content/renderer/pepper/pepper_file_system_host.cc

 // Copyright (c) 2013 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 "content/renderer/pepper/pepper_file_system_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "content/child/child_thread.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
-#include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace content {
 
 namespace {
 
 bool LooksLikeAGuid(const std::string& fsid) {
   const size_t kExpectedFsIdSize = 32;
   if (fsid.size() != kExpectedFsIdSize)
@@ skipping 91 matching lines @@
     case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
       file_system_type = fileapi::kFileSystemTypePersistent;
       break;
     case PP_FILESYSTEMTYPE_EXTERNAL:
       file_system_type = fileapi::kFileSystemTypeExternal;
       break;
     default:
       return PP_ERROR_FAILED;
   }
 
-  PepperPluginInstance* plugin_instance =
-      renderer_ppapi_host_->GetPluginInstance(pp_instance());
-  if (!plugin_instance)
+  GURL document_url = renderer_ppapi_host_->GetDocumentURL(pp_instance());
+  if (!document_url.is_valid())
     return PP_ERROR_FAILED;
 
   FileSystemDispatcher* file_system_dispatcher =
       ChildThread::current()->file_system_dispatcher();
   reply_context_ = context->MakeReplyMessageContext();
   file_system_dispatcher->OpenFileSystem(
-      GURL(plugin_instance->GetContainer()->element().document().url()).
-          GetOrigin(),
+      document_url.GetOrigin(),
       file_system_type,
       base::Bind(&PepperFileSystemHost::DidOpenFileSystem,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&PepperFileSystemHost::DidFailOpenFileSystem,
                  weak_factory_.GetWeakPtr()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PepperFileSystemHost::OnHostMsgInitIsolatedFileSystem(
     ppapi::host::HostMessageContext* context,
@@ skipping 10 matching lines @@
   if (!view)
     return PP_ERROR_FAILED;
   const GURL& url = view->GetWebView()->mainFrame()->document().url();
   root_url_ = GURL(fileapi::GetIsolatedFileSystemRootURIString(
       url.GetOrigin(), fsid, "crxfs"));
   opened_ = true;
   return PP_OK;
 }
 
 }  // namespace content