Revert of Reland #2 "ipc: Add a new field num_brokered_attachments to the message header."

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 8a7c3ae51b6a313d9e66e8d71e3e01d79706dd30..1e39ed4aab0043d1af2633d45b648c7a28b741d9 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -53,7 +53,6 @@
 #include "content/common/content_switches_internal.h"
 #include "content/common/host_discardable_shared_memory_manager.h"
 #include "content/common/host_shared_bitmap_manager.h"
-#include "content/common/resource_messages.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
@@ -63,7 +62,6 @@
 #include "content/public/common/result_codes.h"
 #include "crypto/nss_util.h"
 #include "device/battery/battery_status_service.h"
-#include "ipc/ipc_channel.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/media.h"
 #include "media/base/user_input_monitor.h"
@@ -1117,10 +1115,6 @@
   // Register the main thread by instantiating it, but don't call any methods.
   main_thread_.reset(
       new BrowserThreadImpl(BrowserThread::UI, base::MessageLoop::current()));
-
-  // TODO(erikchen): Temporary code to help track http://crbug.com/527588.
-  IPC::Channel::SetMessageVerifier(
-      &content::CheckContentsOfDataReceivedMessage);
 }
 
 int BrowserMainLoop::BrowserThreadsStarted() {