Instrument pepper plugin load failures.

content/browser/plugin_service_impl.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 280 matching lines @@
   }
 
   // Record when NPAPI Flash process is started for the first time.
   static bool counted = false;
   if (!counted && UTF16ToUTF8(info.name) == kFlashPluginName) {
     counted = true;
     UMA_HISTOGRAM_ENUMERATION("Plugin.FlashUsage",
                               START_NPAPI_FLASH_AT_LEAST_ONCE,
                               FLASH_USAGE_ENUM_COUNT);
   }
-
+#if defined(OS_CHROMEOS)
+  // TODO(ihf): Move to an earlier place once crbug.com/314301 is fixed. For now
+  // we still want Plugin.FlashUsage recorded if we end up here.
+  LOG(WARNING) << "Refusing to start npapi plugin on ChromeOS.";
+  return NULL;
+#endif
   // This plugin isn't loaded by any plugin process, so create a new process.
   scoped_ptr<PluginProcessHost> new_host(new PluginProcessHost());
   if (!new_host->Init(info)) {
     NOTREACHED();  // Init is not expected to fail.
     return NULL;
   }
   return new_host.release();
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiPluginProcess(
     int render_process_id,
     const base::FilePath& plugin_path,
     const base::FilePath& profile_data_directory) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path))
+  if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path)) {
+    LOG(WARNING) << "Unable to load ppapi plugin. "
+                 << plugin_path.MaybeAsASCII();
     return NULL;
+  }
 
   PpapiPluginProcessHost* plugin_host =
       FindPpapiPluginProcess(plugin_path, profile_data_directory);
   if (plugin_host)
     return plugin_host;
 
   // Validate that the plugin is actually registered.
   PepperPluginInfo* info = GetRegisteredPpapiPluginInfo(plugin_path);
-  if (!info)
+  if (!info) {
+    LOG(WARNING) << "Unable to find ppapi plugin registration."

[piman, 2013/12/09 22:39:06]

nit: space after .

[Scott Hess - ex-Googler, 2013/12/09 23:47:45]

Or rewrite "Unable to ... for: " << path.  And below.

[ilja, 2013/12/10 05:55:31]

Done.

[ilja, 2013/12/10 05:55:31]

Done.

+                 << plugin_path.MaybeAsASCII();
     return NULL;
+  }
 
   // Record when PPAPI Flash process is started for the first time.
   static bool counted = false;
   if (!counted && info->name == kFlashPluginName) {
     counted = true;
     UMA_HISTOGRAM_ENUMERATION("Plugin.FlashUsage",
                               START_PPAPI_FLASH_AT_LEAST_ONCE,
                               FLASH_USAGE_ENUM_COUNT);
   }
 
   // This plugin isn't loaded by any plugin process, so create a new process.
-  return PpapiPluginProcessHost::CreatePluginHost(
+  plugin_host = PpapiPluginProcessHost::CreatePluginHost(
       *info, profile_data_directory);
+  if (!plugin_host)

[piman, 2013/12/09 22:39:06]

nit: needs braces per style.

[ilja, 2013/12/10 05:55:31]

Done.

+    LOG(WARNING) << "Unable to create ppapi plugin process."

[piman, 2013/12/09 22:39:06]

nit: space after .

[ilja, 2013/12/10 05:55:31]

Done.

+                 << plugin_path.MaybeAsASCII();
+
+  return plugin_host;
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess(
     int render_process_id,
     const base::FilePath& plugin_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (filter_ && !filter_->CanLoadPlugin(render_process_id, plugin_path))
     return NULL;
 
@@ skipping 467 matching lines @@
           window, kPluginVersionAtomProperty, plugin_version);
   return true;
 }
 
 bool PluginServiceImpl::IsPluginWindow(HWND window) {
   return gfx::GetClassName(window) == base::string16(kNativeWindowClassName);
 }
 #endif
 
 }  // namespace content