Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2011 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 "chrome/browser/web_resource/web_resource_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 57 matching lines @@
 
   // UtilityProcessHost::Client
   virtual bool OnMessageReceived(const IPC::Message& message) {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(WebResourceService::UnpackerClient, message)
       IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackWebResource_Succeeded,
                           OnUnpackWebResourceSucceeded)
       IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_UnpackWebResource_Failed,
                           OnUnpackWebResourceFailed)
       IPC_MESSAGE_UNHANDLED(handled = false)
-    IPC_END_MESSAGE_MAP_EX()
+    IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   virtual void OnProcessCrashed(int exit_code) {
     if (got_response_)
       return;
 
     OnUnpackWebResourceFailed(
         "Utility process crashed while trying to retrieve web resources.");
   }
@@ skipping 140 matching lines @@
 
   std::string data;
   source->GetResponseAsString(&data);
 
   // UnpackerClient releases itself.
   UnpackerClient* client = new UnpackerClient(this);
   client->Start(data);
 
   Release();
 }