Move ThemeHandler from c/c/e/api; move GetBrowserImages() out of Extension class

chrome/utility/chrome_content_utility_client.cc

Index: chrome/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index cae55abe7d5badad28f55769c39818da1da0c1c4..18e2dec22747913b11e4692c558094dba37f4a80 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -21,13 +21,13 @@
 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
-#include "chrome/common/extensions/api/themes/theme_handler.h"
 #include "chrome/common/extensions/background_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/incognito_handler.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
+#include "chrome/common/extensions/manifest_handlers/theme_handler.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
@@ -61,10 +61,10 @@ void RegisterExtensionManifestHandlers() {
   (new extensions::BrowserActionHandler)->Register();
   (new extensions::DefaultLocaleHandler)->Register();
   (new extensions::IconsHandler)->Register();
+  (new extensions::IncognitoHandler)->Register();
   (new extensions::PageActionHandler)->Register();
-  (new extensions::ThemeHandler)->Register();
   (new extensions::PluginsHandler)->Register();
-  (new extensions::IncognitoHandler)->Register();
+  (new extensions::ThemeHandler)->Register();
 }
 
 }  // namespace