Make the id used in IconMsg_DownloadFavicon unique

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 1031 matching lines @@
         'browser/external_protocol/external_protocol_observer.cc',
         'browser/external_protocol/external_protocol_observer.h',
         'browser/external_tab/external_tab_container.h',
         'browser/favicon/favicon_handler.cc',
         'browser/favicon/favicon_handler.h',
         'browser/favicon/favicon_handler_delegate.h',
         'browser/favicon/favicon_service.cc',
         'browser/favicon/favicon_service.h',
         'browser/favicon/favicon_tab_helper.cc',
         'browser/favicon/favicon_tab_helper.h',
+        'browser/favicon/favicon_util.cc',
+        'browser/favicon/favicon_util.h',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
         'browser/first_run/first_run.cc',
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_dialog.h',
         'browser/first_run/first_run_import_observer.cc',
         'browser/first_run/first_run_import_observer.h',
         'browser/first_run/first_run_internal.h',
         'browser/first_run/first_run_linux.cc',
         'browser/first_run/first_run_mac.mm',
@@ skipping 1760 matching lines @@
         'browser/ui/cocoa/status_icons/status_tray_mac.h',
         'browser/ui/cocoa/status_icons/status_tray_mac.mm',
         'browser/ui/cocoa/styled_text_field.h',
         'browser/ui/cocoa/styled_text_field.mm',
         'browser/ui/cocoa/styled_text_field_cell.h',
         'browser/ui/cocoa/styled_text_field_cell.mm',
         'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h',
         'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm',
         'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.h',
         'browser/ui/cocoa/tab_contents/render_view_context_menu_mac.mm',
-        'browser/ui/cocoa/tab_contents/favicon_util.h',
-        'browser/ui/cocoa/tab_contents/favicon_util.mm',
+        'browser/ui/cocoa/tab_contents/favicon_util_mac.h',
+        'browser/ui/cocoa/tab_contents/favicon_util_mac.mm',
         'browser/ui/cocoa/tab_contents/previewable_contents_controller.h',
         'browser/ui/cocoa/tab_contents/previewable_contents_controller.mm',
         'browser/ui/cocoa/tab_contents/sad_tab_controller.h',
         'browser/ui/cocoa/tab_contents/sad_tab_controller.mm',
         'browser/ui/cocoa/tab_contents/sad_tab_view.h',
         'browser/ui/cocoa/tab_contents/sad_tab_view.mm',
         'browser/ui/cocoa/tab_contents/tab_contents_controller.h',
         'browser/ui/cocoa/tab_contents/tab_contents_controller.mm',
         'browser/ui/cocoa/tab_modal_confirm_dialog_mac.h',
         'browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm',
@@ skipping 2539 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }