Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef.

content/utility/utility_thread_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/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
-#include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "content/child/blink_platform_impl.h"
 #include "content/child/child_process.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/plugin_list.h"
 #include "content/common/utility_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/utility/content_utility_client.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
+#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
+#include "base/files/file_path.h"
+#include "content/common/plugin_list.h"
+#endif
+
 namespace content {
 
 namespace {
 
 template<typename SRC, typename DEST>
 void ConvertVector(const SRC& src, DEST* dest) {
   dest->reserve(src.size());
   for (typename SRC::const_iterator i = src.begin(); i != src.end(); ++i)
     dest->push_back(typename DEST::value_type(*i));
 }
@@ skipping 66 matching lines @@
 }
 
 bool UtilityThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   if (GetContentClient()->utility()->OnMessageReceived(msg))
     return true;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(UtilityThreadImpl, msg)
     IPC_MESSAGE_HANDLER(UtilityMsg_BatchMode_Started, OnBatchModeStarted)
     IPC_MESSAGE_HANDLER(UtilityMsg_BatchMode_Finished, OnBatchModeFinished)
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
     IPC_MESSAGE_HANDLER(UtilityMsg_LoadPlugins, OnLoadPlugins)
-#endif  // OS_POSIX
+#endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void UtilityThreadImpl::OnBatchModeStarted() {
   batch_mode_ = true;
 }
 
 void UtilityThreadImpl::OnBatchModeFinished() {
   batch_mode_ = false;
   ReleaseProcessIfNeeded();
 }
 
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
 void UtilityThreadImpl::OnLoadPlugins(
     const std::vector<base::FilePath>& plugin_paths) {
   PluginList* plugin_list = PluginList::Singleton();
 
   std::vector<WebPluginInfo> plugins;
   // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in
   // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins
   // in |plugin_groups|.
   for (size_t i = 0; i < plugin_paths.size(); ++i) {
     WebPluginInfo plugin;
     if (!plugin_list->LoadPluginIntoPluginList(
         plugin_paths[i], &plugins, &plugin))
       Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
     else
       Send(new UtilityHostMsg_LoadedPlugin(i, plugin));
   }
 
   ReleaseProcessIfNeeded();
 }
 #endif
 
 }  // namespace content