Add a gyp flag to allow removing dependency on ppapi.

content/browser/plugin_data_remover_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_data_remover_impl.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/pepper/pepper_file_message_filter.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/pepper_plugin_info.h"
+#if defined(ENABLE_PPAPI)

[brettw, 2012/11/30 23:18:12]

Put ifdefed includes below the others.

[nilesh, 2012/12/01 00:41:35]

Done.

 #include "ppapi/proxy/ppapi_messages.h"
+#endif
 #include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/plugin_constants.h"
 
 namespace content {
 
 namespace {
 
 // The minimum Flash Player version that implements NPP_ClearSiteData.
 const char kMinFlashVersion[] = "10.3";
 const int64 kRemovalTimeoutMs = 10000;
@@ skipping 137 matching lines @@
 
     // Balancing the AddRef call.
     Release();
   }
 
   // IPC::Listener methods.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
     IPC_BEGIN_MESSAGE_MAP(Context, message)
       IPC_MESSAGE_HANDLER(PluginHostMsg_ClearSiteDataResult,
                           OnClearSiteDataResult)
+#if defined(ENABLE_PPAPI)
       IPC_MESSAGE_HANDLER(PpapiHostMsg_ClearSiteDataResult,
                           OnPpapiClearSiteDataResult)
+#endif
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP()
 
     return true;
   }
 
   virtual void OnChannelError() OVERRIDE {
     if (is_removing_) {
       NOTREACHED() << "Channel error";
       SignalDone();
     }
   }
 
   base::WaitableEvent* event() { return event_.get(); }
 
  private:
   friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
   friend class base::DeleteHelper<Context>;
   virtual ~Context() {}
 
+  IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) {

[brettw, 2012/11/30 23:18:12]

I'd find this much easier to follow if there were two versions of this function,
one for ENABLE_PPAPI and one for not. That way inside the function there would
only be one level of ifdef (for OS_WIN), which should be easier to follow, even
if it's ~2 more lines.

[nilesh, 2012/12/01 00:41:35]

Done.

+#if defined(ENABLE_PPAPI)
+    FilePath profile_path =
+        PepperFileMessageFilter::GetDataDirName(browser_context_path_);
+    // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc
+    // (which prepends the plugin name to the relative part of the path
+    // instead, with the absolute, profile-dependent part being enforced by
+    // the browser).
+#if defined(OS_WIN)
+    FilePath plugin_data_path =
+        profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_)));
+#else
+    FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_));
+#endif  // defined(OS_WIN)
+    return new PpapiMsg_ClearSiteData(0u, plugin_data_path, std::string(),
+                                      kClearAllData, max_age);
+#else
+    NOTREACHED() << "CreatePpapiClearSiteDataMsg called with "
+        << "ENABLE_PPAPI undefined.";
+    return NULL;
+#endif  // defined(ENABLE_PPAPI)
+  }
+
   // Connects the client side of a newly opened plug-in channel.
   void ConnectToChannel(const IPC::ChannelHandle& handle, bool is_ppapi) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
     // If we timed out, don't bother connecting.
     if (!is_removing_)
       return;
 
     DCHECK(!channel_.get());
     channel_.reset(new IPC::Channel(handle, IPC::Channel::MODE_CLIENT, this));
     if (!channel_->Connect()) {
       NOTREACHED() << "Couldn't connect to plugin";
       SignalDone();
       return;
     }
 
     uint64 max_age = begin_time_.is_null() ?
         std::numeric_limits<uint64>::max() :
         (base::Time::Now() - begin_time_).InSeconds();
 
     IPC::Message* msg;
     if (is_ppapi) {
-      FilePath profile_path =
-          PepperFileMessageFilter::GetDataDirName(browser_context_path_);
-      // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc
-      // (which prepends the plugin name to the relative part of the path
-      // instead, with the absolute, profile-dependent part being enforced by
-      // the browser).
-#if defined(OS_WIN)
-      FilePath plugin_data_path =
-          profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_)));
-#else
-      FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_));
-#endif
-      msg = new PpapiMsg_ClearSiteData(0u, plugin_data_path, std::string(),
-                                       kClearAllData, max_age);
+      msg = CreatePpapiClearSiteDataMsg(max_age);
     } else {
       msg = new PluginMsg_ClearSiteData(std::string(), kClearAllData, max_age);
     }
     if (!channel_->Send(msg)) {
       NOTREACHED() << "Couldn't send ClearSiteData message";
       SignalDone();
       return;
     }
   }
 
@@ skipping 55 matching lines @@
 
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
   context_ = new Context(begin_time, browser_context_);
   context_->Init(mime_type_);
   return context_->event();
 }
 
 }  // namespace content