Move image codec stuff to toplevel gfx.

TBR=darin
BUG=none
TEST=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41911 0039d316-1c4b-4281-b951-d872f2087c98

54 files changed, 62 insertions, 62 deletions

diff --git a/app/app.gyp b/app/app.gyp
index ad68fda..cf4f3d9 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -39,8 +39,6 @@
       'sources': [
         'animation_unittest.cc',
         'clipboard/clipboard_unittest.cc',
-        'gfx/codec/jpeg_codec_unittest.cc',
-        'gfx/codec/png_codec_unittest.cc',
         'gfx/color_utils_unittest.cc',
         'gfx/font_unittest.cc',
         'gfx/native_theme_win_unittest.cc',
diff --git a/app/app_base.gypi b/app/app_base.gypi
index e6a80c5..a28f8f52 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -114,10 +114,6 @@
         'gfx/canvas_linux.cc',
         'gfx/canvas_mac.mm',
         'gfx/canvas_win.cc',
-        'gfx/codec/jpeg_codec.cc',
-        'gfx/codec/jpeg_codec.h',
-        'gfx/codec/png_codec.cc',
-        'gfx/codec/png_codec.h',
         'gfx/color_utils.cc',
         'gfx/color_utils.h',
         'gfx/favicon_size.h',
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index 20244d7..a5f42db 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -4,10 +4,10 @@
 
 #include "app/resource_bundle.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
+#include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
diff --git a/app/win_util.cc b/app/win_util.cc
index 4698c35..3e3d890 100644
--- a/app/win_util.cc
+++ b/app/win_util.cc
@@ -11,7 +11,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ -26,6 +25,7 @@
 #include "base/scoped_handle_win.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/codec/png_codec.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 765f029..042f3aa 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -5,7 +5,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "app/l10n_util.h"
-#include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/test/testing_profile.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index 96da421..27e7281 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "base/callback.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 
 using base::Time;
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
index 3e04d68..58bcf1c 100644
--- a/chrome/browser/browser_theme_pack.cc
+++ b/chrome/browser/browser_theme_pack.cc
@@ -9,7 +9,6 @@
 #include <set>
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/resource_bundle.h"
 #include "base/data_pack.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/common/extensions/extension.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 2c97d94..76cd7ab 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/browser_theme_provider.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/cocoa/history_menu_bridge.mm b/chrome/browser/cocoa/history_menu_bridge.mm
index 85b9a72..c40614b 100644
--- a/chrome/browser/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/cocoa/history_menu_bridge.mm
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/cocoa/history_menu_bridge.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
@@ -19,6 +18,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
diff --git a/chrome/browser/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/cocoa/history_menu_bridge_unittest.mm
index 6052cc2..e8d5dd7 100644
--- a/chrome/browser/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/cocoa/history_menu_bridge_unittest.mm
@@ -5,7 +5,6 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/ref_counted_memory.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/history_menu_bridge.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
+#include "gfx/codec/png_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class HistoryMenuBridgeTest : public CocoaTest {
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
index 604b641..9b9945b 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -13,6 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/dom_ui/fileicon_source.cc b/chrome/browser/dom_ui/fileicon_source.cc
index 20091a9..ec0105d 100644
--- a/chrome/browser/dom_ui/fileicon_source.cc
+++ b/chrome/browser/dom_ui/fileicon_source.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/dom_ui/fileicon_source.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/time_format.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 807b90b..724fd9c 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/extension_tabs_module.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/base64.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
@@ -24,6 +23,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 65d19be..fbaca6a 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/extensions_ui.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
@@ -43,6 +42,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index 4021dec..1fcfaaf 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -6,7 +6,6 @@
 
 #include <set>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/base64.h"
 #include "base/crypto/signature_verifier.h"
 #include "base/file_util.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "chrome/common/json_value_serializer.h"
+#include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 const char SandboxedExtensionUnpacker::kExtensionHeaderMagic[] = "Cr24";
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index e17daa7..6c36329 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -6,7 +6,6 @@
 
 #include "build/build_config.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/favicon_size.h"
 #include "base/callback.h"
 #include "base/ref_counted_memory.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/codec/png_codec.h"
 #include "skia/ext/image_operations.h"
 
 FavIconHelper::FavIconHelper(TabContents* tab_contents)
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index e4b0a00..79d2abc 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/gears_api.h"
+#include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/dom_operations.h"
diff --git a/chrome/browser/gtk/list_store_favicon_loader.cc b/chrome/browser/gtk/list_store_favicon_loader.cc
index e20211a..b86ad0c 100644
--- a/chrome/browser/gtk/list_store_favicon_loader.cc
+++ b/chrome/browser/gtk/list_store_favicon_loader.cc
@@ -6,10 +6,10 @@
 
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/callback.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 2cdce64..5cb6e1d 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ -19,6 +18,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 5be4a77..a1987b5 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -16,6 +15,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 1cf7021..00e9154 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -20,7 +20,6 @@
 #include <time.h>
 #include <algorithm>
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "base/basictypes.h"
@@ -45,6 +44,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index 9fab35c..edfb6a8 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/history/thumbnail_database.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/file_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/thumbnail_score.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace history {
diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index 2b63e43..c0d9ff1 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -11,6 +10,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 1206843..693fbfc7 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/history/top_sites.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/logging.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace history {
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
index 371a7c3..4a685ee 100644
--- a/chrome/browser/icon_loader_linux.cc
+++ b/chrome/browser/icon_loader_linux.cc
@@ -8,7 +8,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/linux_util.h"
@@ -16,6 +15,7 @@
 #include "base/mime_util.h"
 #include "base/thread.h"
 #include "base/string_util.h"
+#include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 static int SizeToInt(IconLoader::IconSize size) {
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index d257d63..84a37da 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/importer/importer.h"
 
 #include "app/gfx/favicon_size.h"
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
diff --git a/chrome/browser/jumplist.cc b/chrome/browser/jumplist.cc
index c59cd7b..41b257c 100644
--- a/chrome/browser/jumplist.cc
+++ b/chrome/browser/jumplist.cc
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -33,6 +32,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/icon_util.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc
index 12269e4..a8bc57b 100644
--- a/chrome/browser/possible_url_model.cc
+++ b/chrome/browser/possible_url_model.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/possible_url_model.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc
index 614e44b..84ce653 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/search_engines/template_url_table_model.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
@@ -15,6 +14,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profile.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index fdea1da..2a03f75 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -13,7 +13,6 @@
 #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"
@@ -34,6 +33,7 @@
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/chrome_thread.h"
+#include "gfx/codec/png_codec.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index 94a7e6d..5a84923 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -7,12 +7,12 @@
 #include <stack>
 #include <vector>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "gfx/codec/png_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace browser_sync {
diff --git a/chrome/browser/thumbnail_store.cc b/chrome/browser/thumbnail_store.cc
index d89368c..5ca13de 100644
--- a/chrome/browser/thumbnail_store.cc
+++ b/chrome/browser/thumbnail_store.cc
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <algorithm>
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/basictypes.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/thumbnail_store_unittest.cc b/chrome/browser/thumbnail_store_unittest.cc
index 089f84e..e28765f 100644
--- a/chrome/browser/thumbnail_store_unittest.cc
+++ b/chrome/browser/thumbnail_store_unittest.cc
@@ -9,7 +9,6 @@
 
 #include "chrome/browser/thumbnail_store.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "base/time.h"
@@ -21,6 +20,7 @@
 #include "chrome/common/ref_counted_util.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/views/create_application_shortcut_view.cc b/chrome/browser/views/create_application_shortcut_view.cc
index 672f98f..80ca463 100644
--- a/chrome/browser/views/create_application_shortcut_view.cc
+++ b/chrome/browser/views/create_application_shortcut_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/create_application_shortcut_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/load_flags.h"
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index b00ae94..c1519f3 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/options/general_page_view.h"
 
 #include "app/combobox_model.h"
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
@@ -29,6 +28,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
+#include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 5e29246..91bb373 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -9,7 +9,6 @@
 #include <set>
 #include <string>
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/codec/png_codec.h"
 #include "webkit/glue/password_form.h"
 
 // Encryptor is the *wrong* way of doing things; we need to turn it into a
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index 5b48dab..180c491 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/common/security_filter_peer.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 52aede1..50c1797 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/renderer/print_web_view_helper.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "grit/generated_resources.h"
 #include "printing/units.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 08b087b..d85396b 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/file_util.h"
 #include "base/shared_memory.h"
 #include "chrome/common/content_settings.h"
@@ -10,6 +9,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/test/render_view_test.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "net/base/net_errors.h"
 #include "printing/image.h"
 #include "printing/native_metafile.h"
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index cb3a097..4353ac0 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -15,7 +15,6 @@
 #include <vector>
 
 #if defined(OS_WIN)
-#include "app/gfx/codec/jpeg_codec.h"
 #include "app/gfx/gdi_util.h"
 #include "app/gfx/native_theme_win.h"
 #endif
@@ -35,6 +34,7 @@
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "gfx/blit.h"
 #if defined(OS_WIN)
+#include "gfx/codec/jpeg_codec.h"
 #include "skia/ext/vector_platform_device.h"
 #endif
 #include "third_party/npapi/bindings/npapi_extensions.h"
@@ -1284,7 +1284,7 @@ bool WebPluginDelegatePepper::DrawJPEGToPlatformDC(
 
   // Ideally we should add JPEG compression to the VectorPlatformDevice class
   // However, Skia currently has no JPEG compression code and we cannot
-  // depend on app/gfx/jpeg_codec.h in Skia. So we do the compression here.
+  // depend on gfx/jpeg_codec.h in Skia. So we do the compression here.
   SkAutoLockPixels lock(bitmap);
   DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);
   const uint32_t* pixels =
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc
index a7a2bd9..2900c28 100644
--- a/chrome/tools/profiles/generate_profile.cc
+++ b/chrome/tools/profiles/generate_profile.cc
@@ -7,7 +7,6 @@
 
 #include "chrome/tools/profiles/thumbnail-inl.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
 #include "base/at_exit.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
@@ -18,6 +17,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/common/thumbnail_score.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
diff --git a/app/gfx/codec/DEPS b/gfx/codec/DEPS
index e4907a6c..e4907a6c 100644
--- a/app/gfx/codec/DEPS
+++ b/gfx/codec/DEPS
diff --git a/app/gfx/codec/jpeg_codec.cc b/gfx/codec/jpeg_codec.cc
index 49a72ca..d16a6d2b 100644
--- a/app/gfx/codec/jpeg_codec.cc
+++ b/gfx/codec/jpeg_codec.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/jpeg_codec.h"
+#include "gfx/codec/jpeg_codec.h"
 
 #include <setjmp.h>
 
diff --git a/app/gfx/codec/jpeg_codec.h b/gfx/codec/jpeg_codec.h
index 8f58ecd..792930f 100644
--- a/app/gfx/codec/jpeg_codec.h
+++ b/gfx/codec/jpeg_codec.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APP_GFX_CODEC_JPEG_CODEC_H_
-#define APP_GFX_CODEC_JPEG_CODEC_H_
+#ifndef GFX_CODEC_JPEG_CODEC_H_
+#define GFX_CODEC_JPEG_CODEC_H_
 
 #include <vector>
 
@@ -60,4 +60,4 @@ class JPEGCodec {
 
 }  // namespace gfx
 
-#endif  // APP_GFX_CODEC_JPEG_CODEC_H_
+#endif  // GFX_CODEC_JPEG_CODEC_H_
diff --git a/app/gfx/codec/jpeg_codec_unittest.cc b/gfx/codec/jpeg_codec_unittest.cc
index bf8eaab..16fc848 100644
--- a/app/gfx/codec/jpeg_codec_unittest.cc
+++ b/gfx/codec/jpeg_codec_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <math.h>
 
-#include "app/gfx/codec/jpeg_codec.h"
+#include "gfx/codec/jpeg_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gfx {
diff --git a/app/gfx/codec/png_codec.cc b/gfx/codec/png_codec.cc
index 965d81c..eaf94f0 100644
--- a/app/gfx/codec/png_codec.cc
+++ b/gfx/codec/png_codec.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/codec/png_codec.h"
+#include "gfx/codec/png_codec.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
diff --git a/app/gfx/codec/png_codec.h b/gfx/codec/png_codec.h
index 6460701..f9f754a 100644
--- a/app/gfx/codec/png_codec.h
+++ b/gfx/codec/png_codec.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef APP_GFX_CODEC_PNG_CODEC_H_
-#define APP_GFX_CODEC_PNG_CODEC_H_
+#ifndef GFX_CODEC_PNG_CODEC_H_
+#define GFX_CODEC_PNG_CODEC_H_
 
 #include <vector>
 
@@ -101,4 +101,4 @@ class PNGCodec {
 
 }  // namespace gfx
 
-#endif  // APP_GFX_CODEC_PNG_CODEC_H_
+#endif  // GFX_CODEC_PNG_CODEC_H_
diff --git a/app/gfx/codec/png_codec_unittest.cc b/gfx/codec/png_codec_unittest.cc
index 06eb283..19d1f19 100644
--- a/app/gfx/codec/png_codec_unittest.cc
+++ b/gfx/codec/png_codec_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <math.h>
 
-#include "app/gfx/codec/png_codec.h"
+#include "gfx/codec/png_codec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index 366beff..0aabe26 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -17,6 +17,8 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
+        'codec/jpeg_codec_unittest.cc',
+        'codec/png_codec_unittest.cc',
         'insets_unittest.cc',
         'rect_unittest.cc',
         'run_all_unittests.cc',
@@ -56,6 +58,10 @@
       'sources': [
         'blit.cc',
         'blit.h',
+        'codec/jpeg_codec.cc',
+        'codec/jpeg_codec.h',
+        'codec/png_codec.cc',
+        'codec/png_codec.h',
         'gfx_paths.cc',
         'gfx_paths.h',
         'insets.cc',
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 0a733af..c6a4319 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -4,13 +4,13 @@
 
 #include "printing/emf_win.h"
 
-#include "app/gfx/codec/jpeg_codec.h"
-#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/gdi_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "gfx/codec/jpeg_codec.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/printing/image.cc b/printing/image.cc
index 685e9bd..042ebf0 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -4,10 +4,10 @@
 
 #include "printing/image.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/string_util.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_device.h"
 
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index e0a8263..92b70a7 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -8,11 +8,11 @@
 #include <unistd.h>
 #endif
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "gfx/codec/png_codec.h"
 #include "skia/ext/vector_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index 2b9a3e0..7c16dcd 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -13,7 +13,6 @@
 #include <string>
 #include <iostream>
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -21,6 +20,7 @@
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/codec/png_codec.h"
 
 #if defined(OS_WIN)
 #include "windows.h"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 74b1fef..69455ae 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -6,7 +6,6 @@
 
 #include "webkit/tools/test_shell/test_shell.h"
 
-#include "app/gfx/codec/png_codec.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
@@ -21,6 +20,7 @@
 #include "base/stats_table.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "gfx/codec/png_codec.h"
 #include "gfx/size.h"
 #include "googleurl/src/url_util.h"
 #include "grit/webkit_strings.h"