Exclude content/plugin/ when plugins are disabled.

content/browser/plugin_data_remover_impl.cc

Index: content/browser/plugin_data_remover_impl.cc
diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc
index 9c11458aa9ffdf8a2e308bbb6ff34defa08dddd3..731f1e6407127dfc7bb43854a5955cf3b06f7f8b 100644
--- a/content/browser/plugin_data_remover_impl.cc
+++ b/content/browser/plugin_data_remover_impl.cc
@@ -20,13 +20,10 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/pepper_plugin_info.h"
+#include "ppapi/proxy/ppapi_messages.h"
 #include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/plugin_constants.h"
 
-#if defined(ENABLE_PLUGINS)
-#include "ppapi/proxy/ppapi_messages.h"
-#endif
-
 namespace content {
 
 namespace {
@@ -181,10 +178,8 @@ class PluginDataRemoverImpl::Context
     IPC_BEGIN_MESSAGE_MAP(Context, message)
       IPC_MESSAGE_HANDLER(PluginHostMsg_ClearSiteDataResult,
                           OnClearSiteDataResult)
-#if defined(ENABLE_PLUGINS)
       IPC_MESSAGE_HANDLER(PpapiHostMsg_ClearSiteDataResult,
                           OnPpapiClearSiteDataResult)
-#endif
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP()
 
@@ -205,7 +200,6 @@ class PluginDataRemoverImpl::Context
   friend class base::DeleteHelper<Context>;
   virtual ~Context() {}
 
-#if defined(ENABLE_PLUGINS)
   IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) {
     FilePath profile_path =
         PepperFlashFileHost::GetDataDirName(browser_context_path_);
@@ -222,13 +216,6 @@ class PluginDataRemoverImpl::Context
     return new PpapiMsg_ClearSiteData(0u, plugin_data_path, std::string(),
                                       kClearAllData, max_age);
   }
-#else
-  IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) {
-    NOTREACHED() << "CreatePpapiClearSiteDataMsg called with "
-        << "ENABLE_PLUGINS undefined.";
-    return NULL;
-  }
-#endif  // defined(ENABLE_PLUGINS)
 
   // Connects the client side of a newly opened plug-in channel.
   void ConnectToChannel(const IPC::ChannelHandle& handle, bool is_ppapi) {