diff options
author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 23:32:50 +0000 |
---|---|---|
committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 23:32:50 +0000 |
commit | 2432c058351cb5b4da6b1c5a9c756d1758c9ee5d (patch) | |
tree | 372850500a04180aa8e45c38347010a15398eaee /chrome | |
parent | f574c40f701805a0da0129915a9dc691cd79d355 (diff) | |
download | chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.zip chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.tar.gz chromium_src-2432c058351cb5b4da6b1c5a9c756d1758c9ee5d.tar.bz2 |
The refactors PPB_Flash_File_ModuleLocal/FileRef to the new resource model. Calls for both these interfaces are now made directly to the browser. This removes the in-process implementation for these interfaces also (as they are flash-only). Tests are added for PPB_Flash_File_ModuleLocal.
Review URL: https://codereview.chromium.org/11359097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 5 | ||||
-rw-r--r-- | chrome/browser/chrome_content_browser_client.h | 1 | ||||
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 1 | ||||
-rw-r--r-- | chrome/nacl/nacl_ipc_adapter.cc | 4 | ||||
-rw-r--r-- | chrome/test/ppapi/ppapi_browsertest.cc | 5 |
5 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 2c9ea56..ed16096 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1824,11 +1824,6 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI( return false; } -bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() { - return CommandLine::ForCurrentProcess()->HasSwitch( - switches::kPpapiFlashInProcess); -} - FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() { FilePath directory; PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 75ce0ae..53a89f3 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -213,7 +213,6 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { content::BrowserContext* browser_context, const GURL& url, const content::SocketPermissionRequest& params) OVERRIDE; - virtual bool AllowPepperPrivateFileAPI() OVERRIDE; virtual FilePath GetHyphenDictionaryDirectory() OVERRIDE; #if defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 8c5a86b..eef1dac 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -771,6 +771,7 @@ void NaClProcessHost::OnPpapiChannelCreated( ipc_proxy_channel_.get(), //process_.get(), // sender permissions_, process_->GetData().handle, + process_->GetData().id, ipc_proxy_channel_.get(), chrome_render_message_filter_->GetHostResolver(), chrome_render_message_filter_->render_process_id(), diff --git a/chrome/nacl/nacl_ipc_adapter.cc b/chrome/nacl/nacl_ipc_adapter.cc index 2bbaa1f..d7e7786 100644 --- a/chrome/nacl/nacl_ipc_adapter.cc +++ b/chrome/nacl/nacl_ipc_adapter.cc @@ -546,6 +546,10 @@ bool NaClIPCAdapter::OnMessageReceived(const IPC::Message& msg) { base::Passed(&response))); break; } + case ppapi::proxy::SerializedHandle::FILE: + // TODO(raymes): Handle file handles for NaCl. + NOTIMPLEMENTED(); + break; case ppapi::proxy::SerializedHandle::INVALID: { // Nothing to do. TODO(dmichael): Should we log this? Or is it // sometimes okay to pass an INVALID handle? diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 293bd32..964d0e7 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -659,8 +659,6 @@ TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop) TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset) TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs) TEST_PPAPI_OUT_OF_PROCESS(Flash_GetSetting) -// No in-process test for SetCrashData. -TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) // NaCl based PPAPI tests with WebSocket server TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket) @@ -886,8 +884,9 @@ TEST_PPAPI_OUT_OF_PROCESS(MessageLoop_Post) // Going forward, Flash APIs will only work out-of-process. TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL) +TEST_PPAPI_OUT_OF_PROCESS(Flash_SetCrashData) TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) -TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) +TEST_PPAPI_OUT_OF_PROCESS(FlashFile) // Mac/Aura reach NOTIMPLEMENTED/time out. // mac: http://crbug.com/96767 // aura: http://crbug.com/104384 |