Add some missing ENABLE_PLUGINS ifdefs.

content/browser/frame_host/render_frame_host_manager_unittest.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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
@@ skipping 192 matching lines @@
 
 // This observer is used to check whether IPC messages are being filtered for
 // swapped out RenderFrameHost objects. It observes the plugin crash and favicon
 // update events, which the FilterMessagesWhileSwappedOut test simulates being
 // sent. The test is successful if the event is not observed.
 // See http://crbug.com/351815
 class PluginFaviconMessageObserver : public WebContentsObserver {
  public:
   PluginFaviconMessageObserver(WebContents* web_contents)
       : WebContentsObserver(web_contents),
+#if defined(ENABLE_PLUGINS)

[Lei Zhang, 2014/10/30 21:48:54]

I think you can get away without the ifdefs in PluginFaviconMessageObserver. It
doesn't reference any plugin classes directly and it's in a test file, so it's
not bytes shipped to users.

[tommycli, 2014/10/30 22:37:21]

Done.

         plugin_crashed_(false),
-        favicon_received_(false) { }
+#endif
+        favicon_received_(false) {
+  }
 
+#if defined(ENABLE_PLUGINS)
   void PluginCrashed(const base::FilePath& plugin_path,
                      base::ProcessId plugin_pid) override {
     plugin_crashed_ = true;
   }
 
+  bool plugin_crashed() {
+    return plugin_crashed_;
+  }
+#endif
+
   void DidUpdateFaviconURL(const std::vector<FaviconURL>& candidates) override {
     favicon_received_ = true;
   }
 
-  bool plugin_crashed() {
-    return plugin_crashed_;
-  }
-
   bool favicon_received() {
     return favicon_received_;
   }
 
  private:
+#if defined(ENABLE_PLUGINS)
   bool plugin_crashed_;
+#endif
   bool favicon_received_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginFaviconMessageObserver);
 };
 
 // Ensures that RenderFrameDeleted and RenderFrameCreated are called in a
 // consistent manner.
 class FrameLifetimeConsistencyChecker : public WebContentsObserver {
  public:
   explicit FrameLifetimeConsistencyChecker(WebContentsImpl* web_contents)
@@ skipping 298 matching lines @@
   EXPECT_TRUE(ntp_rfh->is_swapped_out());
   {
     PluginFaviconMessageObserver observer(contents());
     EXPECT_TRUE(
         ntp_rfh->GetRenderViewHost()->OnMessageReceived(
             ViewHostMsg_UpdateFaviconURL(
                 dest_rfh->GetRenderViewHost()->GetRoutingID(), icons)));
     EXPECT_FALSE(observer.favicon_received());
   }
 
+#if defined(ENABLE_PLUGINS)
   // The same logic should apply to RenderFrameHosts as well and routing through
   // swapped out RFH shouldn't be allowed. Use a PluginCrashObserver to check
   // if the IPC message is allowed through or not.
   {
     PluginFaviconMessageObserver observer(contents());
     EXPECT_TRUE(ntp_rfh->OnMessageReceived(
                     FrameHostMsg_PluginCrashed(
                         ntp_rfh->GetRoutingID(), base::FilePath(), 0)));
     EXPECT_FALSE(observer.plugin_crashed());
   }
+#endif
 
   // We cannot filter out synchronous IPC messages, because the renderer would
   // be left waiting for a reply.  We pick RunBeforeUnloadConfirm as an example
   // that can run easily within a unit test, and that needs to receive a reply
   // without showing an actual dialog.
   MockRenderProcessHost* ntp_process_host =
       static_cast<MockRenderProcessHost*>(ntp_rfh->GetProcess());
   ntp_process_host->sink().ClearMessages();
   const base::string16 msg = base::ASCIIToUTF16("Message");
   bool result = false;
@@ skipping 1223 matching lines @@
    pending_rfh->GetSiteInstance()->increment_active_frame_count();
 
     contents()->GetMainFrame()->OnMessageReceived(
         FrameHostMsg_BeforeUnload_ACK(0, false, now, now));
     EXPECT_FALSE(contents()->cross_navigation_pending());
     EXPECT_FALSE(rfh_deleted_observer.deleted());
   }
 }
 
 }  // namespace content