Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes...

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2006-2009 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 <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <string>
 #include <vector>
 
+#include "app/gfx/codec/png_codec.h"
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/png_encoder.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 114 matching lines @@
 
     // 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;
-    PNGEncoder::EncodeBGRASkBitmap(shortcut_info_.favicon, false, &png_data);
+    gfx::PNGCodec::EncodeBGRASkBitmap(shortcut_info_.favicon, 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");
 
@@ skipping 197 matching lines @@
     }
   }
   return output_buffer;
 }
 
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info) {
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
       new CreateDesktopShortcutTask(shortcut_info));
 }