GTK: Update ImageLoadingTracker::Observer subclasses

chrome/browser/shell_integration_linux.cc

 // 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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 55 matching lines @@
     return false;
   }
   close(devnull);
 
   return base::WaitForExitCode(handle, exit_code);
 }
 
 std::string CreateShortcutIcon(
     const ShellIntegration::ShortcutInfo& shortcut_info,
     const FilePath& shortcut_filename) {
-  if (shortcut_info.favicon.isNull())
+  if (shortcut_info.favicon.IsEmpty())
     return std::string();
 
   // TODO(phajdan.jr): Report errors from this function, possibly as infobars.
   ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDir())
     return std::string();
 
   FilePath temp_file_path = temp_dir.path().Append(
       shortcut_filename.ReplaceExtension("png"));
 
   std::vector<unsigned char> png_data;
-  gfx::PNGCodec::EncodeBGRASkBitmap(shortcut_info.favicon, false, &png_data);
+  const SkBitmap* bitmap = shortcut_info.favicon.ToSkBitmap();
+  gfx::PNGCodec::EncodeBGRASkBitmap(*bitmap, false, &png_data);
   int bytes_written = file_util::WriteFile(temp_file_path,
       reinterpret_cast<char*>(png_data.data()), png_data.size());
 
   if (bytes_written != static_cast<int>(png_data.size()))
     return std::string();
 
   std::vector<std::string> argv;
   argv.push_back("xdg-icon-resource");
   argv.push_back("install");
 
   // Always install in user mode, even if someone runs the browser as root
   // (people do that).
   argv.push_back("--mode");
   argv.push_back("user");
 
   argv.push_back("--size");
-  argv.push_back(base::IntToString(shortcut_info.favicon.width()));
+  argv.push_back(base::IntToString(bitmap->width()));
 
   argv.push_back(temp_file_path.value());
   std::string icon_name = temp_file_path.BaseName().RemoveExtension().value();
   argv.push_back(icon_name);
   int exit_code;
   LaunchXdgUtility(argv, &exit_code);
   return icon_name;
 }
 
 void CreateShortcutOnDesktop(const FilePath& shortcut_filename,
@@ skipping 486 matching lines @@
       shortcut_info.extension_id,
       shortcut_info.title,
       icon_name);
 
   if (shortcut_info.create_on_desktop)
     CreateShortcutOnDesktop(shortcut_filename, contents);
 
   if (shortcut_info.create_in_applications_menu)
     CreateShortcutInApplicationsMenu(shortcut_filename, contents);
 }