Make icon_messages use the IPC macros for defining the structs and the serialization code, and mo...

chrome/browser/favicon_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAVICON_HELPER_H__
 #define CHROME_BROWSER_FAVICON_HELPER_H__
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/favicon_service.h"
-#include "chrome/common/icon_messages.h"
+#include "chrome/common/favicon_url.h"
 #include "chrome/common/ref_counted_util.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/favicon_size.h"
 
 class NavigationEntry;
 class Profile;
 class RefCountedMemory;
 class SkBitmap;
@@ skipping 123 matching lines @@
                     const GURL& image_url,
                     ImageDownloadCallback* callback,
                     history::IconType icon_type);
 
     GURL url;
     GURL image_url;
     ImageDownloadCallback* callback;
     history::IconType icon_type;
   };
 
-  static bool do_url_and_icon_match(const FaviconURL& favicon_url,
-                                    const GURL& url,
-                                    history::IconType icon_type) {
-    return favicon_url.icon_url == url &&
-        favicon_url.icon_type == static_cast<IconType>(icon_type);
-  }
-
-  // Returns history::IconType the given icon_type corresponds to.
-  static history::IconType ToHistoryIconType(IconType icon_type);
-
   // TabContentsObserver overrides.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
                             const SkBitmap& image);
 
   // See description above class for details.
   void OnFaviconDataForInitialURL(FaviconService::Handle handle,
@@ skipping 80 matching lines @@
   // The current candidate's index in urls_.
   size_t current_url_index_;
 
   // The FaviconData from history.
   history::FaviconData history_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHelper);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_HELPER_H__