Remove keep-alive impulse IPCs from NaCl modules.

chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

 // Copyright 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 "chrome/browser/nacl_host/nacl_browser_delegate_impl.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 27 matching lines @@
 
 namespace {
 
 // These are temporarily needed for testing non-sfi mode on ChromeOS without
 // passing command-line arguments to Chrome.
 const char* const kAllowedNonSfiOrigins[] = {
     "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",  // see http://crbug.com/355141
     "4EB74897CB187C7633357C2FE832E0AD6A44883A"   // see http://crbug.com/355141
 };
 
-// Handles an extension's NaCl process transitioning in or out of idle state by
-// relaying the state to the extension's process manager.
-//
-// A NaCl instance, when active (making PPAPI calls or receiving callbacks),
-// sends keepalive IPCs to the browser process BrowserPpapiHost at a throttled
-// rate. The content::BrowserPpapiHost passes context information up to the
-// chrome level NaClProcessHost where we use the instance's context to find the
-// associated extension process manager.
-//
-// There is a 1:many relationship for extension:nacl-embeds, but only a
-// 1:1 relationship for NaClProcessHost:PP_Instance. The content layer doesn't
-// rely on this knowledge because it routes messages for ppapi non-nacl
-// instances as well, though they won't have callbacks set. Here the 1:1
-// assumption is made and DCHECKed.
-void OnKeepaliveOnUIThread(
-    const content::BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
-    const base::FilePath& profile_data_directory) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  // Only one instance will exist for NaCl embeds, even when more than one
-  // embed of the same plugin exists on the same page.
-  DCHECK_EQ(1U, instance_data.size());
-  if (instance_data.size() < 1)
-    return;
-
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-  extensions::ProcessManager::OnKeepaliveFromPlugin(
-      instance_data[0].render_process_id,
-      instance_data[0].render_frame_id,
-      instance_data[0].document_url.host());
-#endif
-}
-
-// Calls OnKeepaliveOnUIThread on UI thread.
-void OnKeepalive(
-    const content::BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
-    const base::FilePath& profile_data_directory) {
-  DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-                                   base::Bind(&OnKeepaliveOnUIThread,
-                                              instance_data,
-                                              profile_data_directory));
-}
-
 }  // namespace
 
 NaClBrowserDelegateImpl::NaClBrowserDelegateImpl(
     ProfileManager* profile_manager)
     : profile_manager_(profile_manager), inverse_debug_patterns_(false) {
   DCHECK(profile_manager_);
   for (size_t i = 0; i < arraysize(kAllowedNonSfiOrigins); ++i) {
     allowed_nonsfi_origins_.insert(kAllowedNonSfiOrigins[i]);
   }
 }
@@ skipping 112 matching lines @@
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::InfoMap> extension_info_map =
       GetExtensionInfoMap(profile_directory);
   return extension_info_map->MapUrlToLocalFilePath(
       file_url, use_blocking_api, file_path);
 #else
   return false;
 #endif
 }
 
-content::BrowserPpapiHost::OnKeepaliveCallback
-NaClBrowserDelegateImpl::GetOnKeepaliveCallback() {
-  return base::Bind(&OnKeepalive);
-}
-
 bool NaClBrowserDelegateImpl::IsNonSfiModeAllowed(
     const base::FilePath& profile_directory,
     const GURL& manifest_url) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   const extensions::ExtensionSet* extension_set =
       &GetExtensionInfoMap(profile_directory)->extensions();
   return chrome::IsExtensionOrSharedModuleWhitelisted(
       manifest_url, extension_set, allowed_nonsfi_origins_);
 #else
   return false;
 #endif
 }
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 scoped_refptr<extensions::InfoMap> NaClBrowserDelegateImpl::GetExtensionInfoMap(
     const base::FilePath& profile_directory) {
   // Get the profile associated with the renderer.
   Profile* profile = profile_manager_->GetProfileByPath(profile_directory);
   DCHECK(profile);
   scoped_refptr<extensions::InfoMap> extension_info_map =
       extensions::ExtensionSystem::Get(profile)->info_map();
   DCHECK(extension_info_map.get());
   return extension_info_map;
 }
 #endif