Add method to load resources without scale

 This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h

I'll cleanup ContentClient in separate CL.

BUG=156569
TEST=none. no functional change.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165444

Review URL: https://chromiumcodereview.appspot.com/11341003

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

72 files changed, 145 insertions, 187 deletions

diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
index c8823e6..a7b467d 100644
--- a/android_webview/common/aw_content_client.cc
+++ b/android_webview/common/aw_content_client.cc
@@ -31,9 +31,8 @@ base::StringPiece AwContentClient::GetDataResource(
     ui::ScaleFactor scale_factor) const {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 }  // namespace android_webview
-
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index aa45426..93d85a1 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -49,8 +49,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
         FROM_HERE,
         base::Bind(&DevToolsServerDelegate::PopulatePageThumbnails));
     return ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_DEVTOOLS_DISCOVERY_PAGE_HTML,
-        ui::SCALE_FACTOR_NONE).as_string();
+        IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
   }
 
   virtual bool BundlesFrontendResources() {
diff --git a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
index 0f7b327..ce32ad6 100644
--- a/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_image_manager_browsertest.cc
@@ -154,7 +154,7 @@ class UserImageManagerTest : public CrosInProcessBrowserTest,
                         int resource_id) {
     FilePath image_path = GetUserImagePath(username, "png");
     scoped_refptr<base::RefCountedStaticMemory> image_data(
-        ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+        ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, ui::SCALE_FACTOR_100P));
     int written = file_util::WriteFile(
         image_path,
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
index 215a580..1b2c4bb 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -37,7 +37,6 @@
 #include "chromeos/dbus/power_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
@@ -1086,8 +1085,7 @@ void WallpaperManager::MigrateBuiltInWallpaper(const std::string& email) {
       if (type != User::CUSTOMIZED) {
         base::RefCountedStaticMemory* wallpaper =
             ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-                GetWallpaperViewInfo(index, ash::LARGE).id,
-                ui::SCALE_FACTOR_NONE);
+                GetWallpaperViewInfo(index, ash::LARGE).id);
 
         // Saves large wallpaper to user custom wallpaper path.
         wallpaper_path = GetWallpaperPathForUser(email, false);
@@ -1101,8 +1099,7 @@ void WallpaperManager::MigrateBuiltInWallpaper(const std::string& email) {
 
         wallpaper =
             ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-                GetWallpaperViewInfo(index, ash::SMALL).id,
-                ui::SCALE_FACTOR_NONE);
+                GetWallpaperViewInfo(index, ash::SMALL).id);
 
         // Saves small wallpaper to user custom wallpaper thumbnail path.
         wallpaper_path = GetWallpaperPathForUser(email, true);
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index 1f63902..9711729 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -102,7 +102,7 @@ class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
                              const FilePath& wallpaper_path,
                              int resource_id) {
     scoped_refptr<base::RefCountedStaticMemory> image_data(
-        ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+        ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, ui::SCALE_FACTOR_100P));
     int written = file_util::WriteFile(
         wallpaper_path,
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc
index ec75075..36ca970 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.cc
+++ b/chrome/browser/chromeos/offline/offline_load_page.cc
@@ -33,7 +33,6 @@
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -113,7 +112,7 @@ std::string OfflineLoadPage::GetHTMLContents() {
 
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_OFFLINE_LOAD_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_OFFLINE_LOAD_HTML));
   return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
 }
 
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
index 81749b9..cd5a399 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
@@ -18,7 +18,6 @@
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::DevToolsHttpHandlerDelegate;
@@ -46,8 +45,7 @@ std::string BrowserListTabContentsProvider::GetDiscoveryPageHTML() {
     }
   }
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML,
-      ui::SCALE_FACTOR_NONE).as_string();
+      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
 }
 
 bool BrowserListTabContentsProvider::BundlesFrontendResources() {
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 51f0acf..166ab24 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -25,7 +25,6 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/browser_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OFFICIAL_BUILD)
@@ -127,8 +126,7 @@ std::string ComponentLoader::Add(int manifest_resource_id,
                                  const FilePath& root_directory) {
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          manifest_resource_id,
-          ui::SCALE_FACTOR_NONE).as_string();
+          manifest_resource_id).as_string();
   return Add(manifest_contents, root_directory);
 }
 
@@ -275,8 +273,7 @@ void ComponentLoader::AddOrReloadEnterpriseWebStore() {
   if (!enterprise_webstore_url.empty()) {
     std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_ENTERPRISE_WEBSTORE_MANIFEST,
-          ui::SCALE_FACTOR_NONE).as_string();
+          IDR_ENTERPRISE_WEBSTORE_MANIFEST).as_string();
 
     // The manifest is missing some values that are provided by policy.
     DictionaryValue* manifest = ParseManifest(manifest_contents);
@@ -293,8 +290,7 @@ void ComponentLoader::AddChromeApp() {
 #if defined(USE_ASH)
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_CHROME_APP_MANIFEST,
-          ui::SCALE_FACTOR_NONE).as_string();
+          IDR_CHROME_APP_MANIFEST).as_string();
 
   // The Value is kept for the lifetime of the ComponentLoader. This is
   // required in case LoadAll() is called again.
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index c1bd02b..e81591b 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -53,7 +53,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
@@ -336,7 +335,7 @@ void ExtensionHost::InsertInfobarCSS() {
 
   static const base::StringPiece css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_EXTENSIONS_INFOBAR_CSS, ui::SCALE_FACTOR_NONE));
+      IDR_EXTENSIONS_INFOBAR_CSS));
 
   render_view_host()->InsertCSS(string16(), css.as_string());
 }
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 2505856..1d85d8b 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -35,7 +35,6 @@
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_simple_job.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::ResourceRequestInfo;
@@ -89,8 +88,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
                       std::string* data,
                       const net::CompletionCallback& callback) const OVERRIDE {
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    *data = rb.GetRawDataResource(
-        resource_id_, ui::SCALE_FACTOR_NONE).as_string();
+    *data = rb.GetRawDataResource(resource_id_).as_string();
 
     std::string* read_mime_type = new std::string;
     bool* read_result = new bool;
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 9a92189..954bb47 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -303,9 +303,10 @@ bool TopSites::GetPageThumbnail(const GURL& url,
   // Resource bundle is thread safe.
   for (size_t i = 0; i < arraysize(kPrepopulatedPages); i++) {
     if (url == prepopulated_page_urls_[i]) {
-      *bytes = ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-          kPrepopulatedPages[i].thumbnail_id,
-          ui::SCALE_FACTOR_100P);
+      *bytes = ResourceBundle::GetSharedInstance().
+          LoadDataResourceBytesForScale(
+              kPrepopulatedPages[i].thumbnail_id,
+              ui::SCALE_FACTOR_100P);
       return true;
     }
   }
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index d95ca9a..54e6299 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -41,7 +41,6 @@
 #include "net/base/escape.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -206,7 +205,7 @@ string16 DesktopNotificationService::CreateDataUrl(
     int resource, const std::vector<std::string>& subst) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          resource, ui::SCALE_FACTOR_NONE));
+          resource));
 
   if (template_html.empty()) {
     NOTREACHED() << "unable to load template. ID: " << resource;
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc
index ccb8f87..106d0d6 100644
--- a/chrome/browser/plugins/plugin_finder.cc
+++ b/chrome/browser/plugins/plugin_finder.cc
@@ -19,7 +19,6 @@
 #include "content/public/browser/plugin_service.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
@@ -170,7 +169,7 @@ DictionaryValue* PluginFinder::LoadPluginList() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   base::StringPiece json_resource(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_PLUGIN_DB_JSON, ui::SCALE_FACTOR_NONE));
+          IDR_PLUGIN_DB_JSON));
   std::string error_str;
   scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
       json_resource,
diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
index e4f0b4e..9398bf8 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
@@ -17,7 +17,6 @@
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // Define the values of standard URLs.
@@ -68,8 +67,7 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "sharingexplain", IDS_CLOUD_PRINT_SETUP_SHARING_EXPLAIN);
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML,
-                            ui::SCALE_FACTOR_NONE));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintGaiaLoginPath) {
@@ -105,8 +103,7 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL);
 
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_GAIA_LOGIN_HTML,
-                            ui::SCALE_FACTOR_NONE));
+        .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupDonePath) {
@@ -114,15 +111,13 @@ void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
     AddString(dict, "success", IDS_SYNC_SUCCESS);
     AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL);
     static const base::StringPiece html(ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML,
-                            ui::SCALE_FACTOR_NONE));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML));
     SetFontAndTextDirection(dict);
     response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
   } else if (path_raw == kCloudPrintSetupFlowPath) {
     static const base::StringPiece html(
         ResourceBundle::GetSharedInstance()
-        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML,
-                            ui::SCALE_FACTOR_NONE));
+        .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML));
     response = html.as_string();
   }
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 18936bd..c050156 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -42,7 +42,6 @@
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -795,22 +794,19 @@ std::string SafeBrowsingBlockingPageV1::GetHTMLContents() {
   if (unsafe_resources_.size() > 1) {
     PopulateMultipleThreatStringDictionary(&strings);
     html = rb.GetRawDataResource(
-        IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK,
-        ui::SCALE_FACTOR_NONE).as_string();
+        IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK).as_string();
   } else {
     SBThreatType threat_type = unsafe_resources_[0].threat_type;
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE) {
       PopulateMalwareStringDictionary(&strings);
       html = rb.GetRawDataResource(
-          IDR_SAFE_BROWSING_MALWARE_BLOCK,
-          ui::SCALE_FACTOR_NONE).as_string();
+          IDR_SAFE_BROWSING_MALWARE_BLOCK).as_string();
     } else {  // Phishing.
       DCHECK(threat_type == SB_THREAT_TYPE_URL_PHISHING ||
              threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL);
       PopulatePhishingStringDictionary(&strings);
       html = rb.GetRawDataResource(
-          IDR_SAFE_BROWSING_PHISHING_BLOCK,
-          ui::SCALE_FACTOR_NONE).as_string();
+          IDR_SAFE_BROWSING_PHISHING_BLOCK).as_string();
     }
   }
   interstitial_show_time_ = base::TimeTicks::Now();
@@ -1042,8 +1038,8 @@ std::string SafeBrowsingBlockingPageV2::GetHTMLContents() {
              threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL);
       PopulatePhishingStringDictionary(&strings);
     }
-    html = rb.GetRawDataResource(IDR_SAFE_BROWSING_MALWARE_BLOCK_V2,
-                                 ui::SCALE_FACTOR_NONE).as_string();
+    html = rb.GetRawDataResource(IDR_SAFE_BROWSING_MALWARE_BLOCK_V2).
+        as_string();
   }
   interstitial_show_time_ = base::TimeTicks::Now();
   return jstemplate_builder::GetTemplatesHtml(html, &strings, "template-root");
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index e5bc81d..a469310 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -26,7 +26,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::InterstitialPage;
@@ -122,7 +121,7 @@ std::string SSLBlockingPage::GetHTMLContents() {
 
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          resource_id, ui::SCALE_FACTOR_NONE));
+          resource_id));
 
   return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
 }
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 029ee35..e1f660d 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -334,7 +334,7 @@ base::RefCountedMemory* ThemeService::GetRawData(
   if (theme_pack_.get())
     data = theme_pack_->GetRawData(id, scale_factor);
   if (!data)
-    data = rb_.LoadDataResourceBytes(id, ui::SCALE_FACTOR_100P);
+    data = rb_.LoadDataResourceBytesForScale(id, ui::SCALE_FACTOR_100P);
 
   return data;
 }
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 641b64c..4358796 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -51,7 +51,6 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #ifdef FILE_MANAGER_EXTENSION
@@ -437,8 +436,7 @@ void TranslateManager::OnURLFetchComplete(const net::URLFetcher* source) {
         translate_script_request_pending_.release());
     if (!error) {
       base::StringPiece str = ResourceBundle::GetSharedInstance().
-          GetRawDataResource(IDR_TRANSLATE_JS,
-                             ui::SCALE_FACTOR_NONE);
+          GetRawDataResource(IDR_TRANSLATE_JS);
       DCHECK(translate_script_.empty());
       str.CopyToString(&translate_script_);
       std::string data;
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 776511e..f7af1a9 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -38,7 +38,6 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
@@ -194,8 +193,7 @@ class PDFUnsupportedFeatureInterstitial
         l10n_util::GetStringUTF16(IDS_READER_OUT_OF_DATE_BLOCKING_PAGE_CANCEL));
 
     base::StringPiece html(ResourceBundle::GetSharedInstance().
-        GetRawDataResource(IDR_READER_OUT_OF_DATE_HTML,
-                           ui::SCALE_FACTOR_NONE));
+                           GetRawDataResource(IDR_READER_OUT_OF_DATE_HTML));
 
     return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
   }
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 7d7fce2..bdbeea1 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -58,7 +58,6 @@
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_THEMES)
@@ -713,8 +712,7 @@ void FinishMemoryDataRequest(const std::string& path,
     source->FinishDataRequest(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             path == kMemoryJsPath ? IDR_ABOUT_MEMORY_JS :
-                IDR_ABOUT_MEMORY_HTML,
-            ui::SCALE_FACTOR_NONE).as_string(), request_id);
+            IDR_ABOUT_MEMORY_HTML).as_string(), request_id);
   }
 }
 
@@ -865,8 +863,8 @@ std::string AboutStats(const std::string& query) {
   } else {
     // Get about_stats.html/js from resource bundle.
     data = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        (query == kStatsJsPath ? IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML),
-        ui::SCALE_FACTOR_NONE).as_string();
+        (query == kStatsJsPath ?
+         IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML)).as_string();
 
     if (query != kStatsJsPath) {
       // Clear the timer list since we stored the data in the timers list
@@ -1115,7 +1113,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path,
   } else if (host == chrome::kChromeUICreditsHost) {
     int idr = (path == kCreditsJsPath) ? IDR_CREDITS_JS : IDR_CREDITS_HTML;
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        idr, ui::SCALE_FACTOR_NONE).as_string();
+        idr).as_string();
 #if defined(OS_CHROMEOS)
   } else if (host == chrome::kChromeUIDiscardsHost) {
     response = AboutDiscards(path);
@@ -1141,7 +1139,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path,
     response = AboutNetwork(path);
   } else if (host == chrome::kChromeUIOSCreditsHost) {
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string();
+        IDR_OS_CREDITS_HTML).as_string();
 #endif
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
   } else if (host == chrome::kChromeUISandboxHost) {
diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc
index 0ca9208..6d634cf 100644
--- a/chrome/browser/ui/webui/bookmarks_ui.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui.cc
@@ -70,5 +70,5 @@ BookmarksUI::BookmarksUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_BOOKMARKS_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_BOOKMARKS_FAVICON, scale_factor);
 }
diff --git a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
index 69c61f2..2b49cde 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_data_source.cc
@@ -10,7 +10,6 @@
 #include "base/string_util.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ChromeWebUIDataSource::ChromeWebUIDataSource(const std::string& source_name)
@@ -93,6 +92,6 @@ void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(int request_id) {
 void ChromeWebUIDataSource::SendFromResourceBundle(int request_id, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-          idr, ui::SCALE_FACTOR_NONE));
+          idr));
   SendResponse(request_id, response);
 }
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index c5d92c2..5ec84b8 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -41,7 +41,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
@@ -115,7 +114,7 @@ void OobeUIHTMLSource::StartDataRequest(const std::string& path,
 std::string OobeUIHTMLSource::GetDataResource(int resource_id) const {
   const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          resource_id, ui::SCALE_FACTOR_NONE));
+          resource_id));
   return jstemplate_builder::GetI18nTemplateHtml(html,
                                                  localized_strings_.get());
 }
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index b83a10c..f37cbc7 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -41,7 +41,6 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using chromeos::CellularNetwork;
@@ -215,7 +214,7 @@ void MobileSetupUIHTMLSource::StartDataRequest(const std::string& path,
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_MOBILE_SETUP_PAGE_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_MOBILE_SETUP_PAGE_HTML));
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(html,
                                                                   &strings);
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index 0ae2e56..d8b9bbb 100644
--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -20,7 +20,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
@@ -63,7 +62,7 @@ void ProxySettingsHTMLSource::StartDataRequest(const std::string& path,
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_PROXY_SETTINGS_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_PROXY_SETTINGS_HTML));
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       html, localized_strings_.get());
 
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index de08f916..a1f7bca 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -31,7 +31,6 @@
 #include "content/public/browser/web_ui_message_handler.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
@@ -174,8 +173,7 @@ void RegisterPageUIHTMLSource::StartDataRequest(const std::string& path,
 
   scoped_refptr<base::RefCountedMemory> html_bytes(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-          IDR_HOST_REGISTRATION_PAGE_HTML,
-          ui::SCALE_FACTOR_NONE));
+          IDR_HOST_REGISTRATION_PAGE_HTML));
 
   SendResponse(request_id, html_bytes);
 }
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index 160707b..d114c6e 100644
--- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -30,7 +30,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -310,7 +309,7 @@ void SimUnlockUIHTMLSource::StartDataRequest(const std::string& path,
 
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_SIM_UNLOCK_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_SIM_UNLOCK_HTML));
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(html,
                                                                   &strings);
diff --git a/chrome/browser/ui/webui/chromeos/system_info_ui.cc b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
index ec444af..9699e23 100644
--- a/chrome/browser/ui/webui/chromeos/system_info_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/system_info_ui.cc
@@ -36,7 +36,6 @@
 #include "net/base/directory_lister.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
@@ -149,7 +148,7 @@ void SystemInfoUIHTMLSource::RequestComplete() {
   }
   static const base::StringPiece systeminfo_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_ABOUT_SYS_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_ABOUT_SYS_HTML));
   std::string full_html = jstemplate_builder::GetTemplatesHtml(
       systeminfo_html, &strings, "t" /* template root node id */);
   SendResponse(request_id_, base::RefCountedString::TakeString(&full_html));
diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc
index ac7c197..0633cff 100644
--- a/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/chrome/browser/ui/webui/conflicts_ui.cc
@@ -174,7 +174,7 @@ ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return static_cast<base::RefCountedMemory*>(
-      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
           IDR_CONFLICT_FAVICON, scale_factor));
 }
 
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 2949f25..519d827 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -172,7 +172,7 @@ CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_SAD_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_SAD_FAVICON, scale_factor);
 }
 
 // static
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index a58de6a..14b04f4 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -19,7 +19,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -67,7 +66,7 @@ void DevToolsDataSource::StartDataRequest(const std::string& path,
       " with --debug-devtools.";
   const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(
-      resource_id, ui::SCALE_FACTOR_NONE));
+      resource_id));
   SendResponse(request_id, bytes);
 }
 
diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc
index cf23d91..6cf8b79 100644
--- a/chrome/browser/ui/webui/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads_ui.cc
@@ -108,5 +108,5 @@ DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor);
 }
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
index 061eae7..d2704717 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -94,8 +94,8 @@ GURL ExtensionIconSource::GetIconURL(const extensions::Extension* extension,
 // static
 SkBitmap* ExtensionIconSource::LoadImageByResourceId(int resource_id) {
   std::string contents = ResourceBundle::GetSharedInstance()
-      .GetRawDataResource(resource_id,
-                          ui::SCALE_FACTOR_100P).as_string();
+      .GetRawDataResourceForScale(resource_id,
+                                  ui::SCALE_FACTOR_100P).as_string();
 
   // Convert and return it.
   const unsigned char* data =
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 48359c9..de4172b 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -116,7 +116,7 @@ void FaviconSource::StartDataRequest(const std::string& path,
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
         SendResponse(request_id,
-            ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+            ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
                 scale_factor));
         return;
@@ -194,7 +194,7 @@ void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
   if (!default_favicon) {
     ui::ScaleFactor scale_factor = icon_request.scale_factor;
     default_favicon = ResourceBundle::GetSharedInstance()
-        .LoadDataResourceBytes(resource_id, scale_factor);
+        .LoadDataResourceBytesForScale(resource_id, scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index b909f0f..99827e4 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -169,7 +169,7 @@ FlagsUI::FlagsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* FlagsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_FLAGS_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_FLAGS_FAVICON, scale_factor);
 }
 
 // static
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index 3b327a0..e54d695 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -457,5 +457,5 @@ const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_HISTORY_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index 159a06d..9e731ed 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -51,7 +51,6 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if !defined(OS_ANDROID)
@@ -393,7 +392,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(const std::string& path,
     scoped_refptr<base::RefCountedStaticMemory> resource_bytes(
         it->second.second ?
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
-                it->second.second, ui::SCALE_FACTOR_NONE) :
+                it->second.second) :
             new base::RefCountedStaticMemory);
     SendResponse(request_id, resource_bytes);
     return;
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index cdd8730..0ae524b 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -49,7 +49,6 @@
 #include "grit/theme_resources.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_utils.h"
@@ -267,7 +266,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          new_tab_html_idr, ui::SCALE_FACTOR_NONE));
+          new_tab_html_idr));
 
   std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
@@ -425,8 +424,7 @@ void NTPResourceCache::CreateNewTabHTML() {
   // Load the new tab page appropriate for this build
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
       GetRawDataResource(chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
-                             IDR_NEW_TAB_SEARCH_HTML : IDR_NEW_TAB_4_HTML,
-                         ui::SCALE_FACTOR_NONE));
+                         IDR_NEW_TAB_SEARCH_HTML : IDR_NEW_TAB_4_HTML));
   jstemplate_builder::UseVersion2 version2;
   std::string full_html =
       jstemplate_builder::GetI18nTemplateHtml(new_tab_html, &load_time_data);
@@ -457,7 +455,7 @@ void NTPResourceCache::CreateNewTabIncognitoCSS() {
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_NEW_INCOGNITO_TAB_THEME_CSS, ui::SCALE_FACTOR_NONE));
+          IDR_NEW_INCOGNITO_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string full_css = ReplaceStringPlaceholders(
@@ -553,8 +551,7 @@ void NTPResourceCache::CreateNewTabCSS() {
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
-              IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS,
-          ui::SCALE_FACTOR_NONE));
+          IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string;
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
index 34214f8..bdce9e5 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache_android.cc
@@ -20,7 +20,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
@@ -105,8 +104,7 @@ void NTPResourceCache::CreateNewTabHTML() {
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
-      GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML,
-                         ui::SCALE_FACTOR_NONE));
+                                 GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML));
   localized_strings.SetString(
       "device",
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI) ?
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 8cd5b21..5069c8b 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -61,17 +61,19 @@ base::RefCountedMemory* UserImageSource::GetUserImage(
       return new base::RefCountedBytes(user->raw_image());
     } else if (user->image_is_stub()) {
       return ResourceBundle::GetSharedInstance().
-          LoadDataResourceBytes(IDR_PROFILE_PICTURE_LOADING, scale_factor);
+          LoadDataResourceBytesForScale(IDR_PROFILE_PICTURE_LOADING,
+                                        scale_factor);
     } else if (user->HasDefaultImage()) {
       return ResourceBundle::GetSharedInstance().
-          LoadDataResourceBytes(kDefaultImageResourceIDs[user->image_index()],
-                                scale_factor);
+          LoadDataResourceBytesForScale(
+              kDefaultImageResourceIDs[user->image_index()],
+              scale_factor);
     } else {
       NOTREACHED() << "User with custom image missing raw data";
     }
   }
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_LOGIN_DEFAULT_USER, scale_factor);
+      LoadDataResourceBytesForScale(IDR_LOGIN_DEFAULT_USER, scale_factor);
 }
 
 UserImageSource::UserImageSource()
diff --git a/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc b/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc
index f10f32b..30b10bc 100644
--- a/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/wallpaper_thumbnail_source.cc
@@ -254,7 +254,7 @@ void WallpaperThumbnailSource::SendCurrentUserDefaultThumbnail(
   }
   const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SendResponse(request_id,
-               rb.LoadDataResourceBytes(idr, scale_factor));
+               rb.LoadDataResourceBytesForScale(idr, scale_factor));
 }
 
 }  // namespace options
diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc
index 70a83c2..66e60ad 100644
--- a/chrome/browser/ui/webui/options/options_ui.cc
+++ b/chrome/browser/ui/webui/options/options_ui.cc
@@ -147,11 +147,11 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
   } else if (path == kOptionsBundleJsFile) {
     // Return (and cache) the options javascript code.
     response_bytes = ui::ResourceBundle::GetSharedInstance().
-        LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
+        LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS);
   } else {
     // Return (and cache) the main options html page as the default.
     response_bytes = ui::ResourceBundle::GetSharedInstance().
-        LoadDataResourceBytes(IDR_OPTIONS_HTML, ui::SCALE_FACTOR_NONE);
+        LoadDataResourceBytes(IDR_OPTIONS_HTML);
   }
 
   SendResponse(request_id, response_bytes);
@@ -351,7 +351,7 @@ void OptionsUI::ProcessAutocompleteSuggestions(
 base::RefCountedMemory* OptionsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_SETTINGS_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_SETTINGS_FAVICON, scale_factor);
 }
 
 void OptionsUI::InitializeHandlers() {
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
index 57471a8..019fcb2 100644
--- a/chrome/browser/ui/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -487,7 +487,7 @@ PluginsUI::PluginsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 base::RefCountedMemory* PluginsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytes(IDR_PLUGINS_FAVICON, scale_factor);
+      LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor);
 }
 
 // static
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index 1952def..98c08e8 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc
@@ -18,7 +18,6 @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/mime_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ -56,7 +55,7 @@ void SharedResourcesDataSource::StartDataRequest(const std::string& path,
   DCHECK_NE(-1, idr) << " path: " << path;
   const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   scoped_refptr<base::RefCountedStaticMemory> bytes(
-      rb.LoadDataResourceBytes(idr, ui::SCALE_FACTOR_NONE));
+      rb.LoadDataResourceBytes(idr));
 
   SendResponse(request_id, bytes);
 }
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index ca6124a..1ffb6e2 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -135,7 +135,8 @@ void ThemeSource::SendThemeBitmap(int request_id,
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    SendResponse(request_id,
-                 rb.LoadDataResourceBytes(resource_id, scale_factor));
+    SendResponse(
+        request_id,
+        rb.LoadDataResourceBytesForScale(resource_id, scale_factor));
   }
 }
diff --git a/chrome/browser/ui/webui/web_ui_util.cc b/chrome/browser/ui/webui/web_ui_util.cc
index 2001090..6a21b1c 100644
--- a/chrome/browser/ui/webui/web_ui_util.cc
+++ b/chrome/browser/ui/webui/web_ui_util.cc
@@ -51,8 +51,8 @@ std::string GetBitmapDataUrl(const SkBitmap& bitmap) {
 std::string GetBitmapDataUrlFromResource(int res) {
   // Load resource icon and covert to base64 encoded data url
   base::RefCountedStaticMemory* icon_data =
-      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(res,
-          ui::SCALE_FACTOR_100P);
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
+          res, ui::SCALE_FACTOR_100P);
   if (!icon_data)
     return std::string();
   scoped_refptr<base::RefCountedMemory> raw_icon(icon_data);
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 69f1e36..d187f06 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -432,7 +432,7 @@ string16 ChromeContentClient::GetLocalizedString(int message_id) const {
 base::StringPiece ChromeContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 9f1de33..eaf64a6 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -23,7 +23,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/common_resources.h"
 #include "grit/extensions_api_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using base::DictionaryValue;
@@ -76,7 +75,7 @@ bool HasUnprivilegedChild(const DictionaryValue* name_space_node,
 
 base::StringPiece ReadFromResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE);
+      resource_id);
 }
 
 scoped_ptr<ListValue> LoadSchemaList(const std::string& name,
diff --git a/chrome/common/extensions/features/simple_feature_provider.cc b/chrome/common/extensions/features/simple_feature_provider.cc
index f8ca0f8..4edcfe1 100644
--- a/chrome/common/extensions/features/simple_feature_provider.cc
+++ b/chrome/common/extensions/features/simple_feature_provider.cc
@@ -9,7 +9,6 @@
 #include "chrome/common/extensions/features/manifest_feature.h"
 #include "chrome/common/extensions/features/permission_feature.h"
 #include "grit/common_resources.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {
@@ -43,7 +42,7 @@ struct Static {
       int resource_id) {
     std::string manifest_features =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
-            resource_id, ui::SCALE_FACTOR_NONE).as_string();
+            resource_id).as_string();
     int error_code = 0;
     std::string error_message;
     Value* value = base::JSONReader::ReadAndReturnError(
diff --git a/chrome/common/jstemplate_builder.cc b/chrome/common/jstemplate_builder.cc
index 31c0c4d..e8da8bd 100644
--- a/chrome/common/jstemplate_builder.cc
+++ b/chrome/common/jstemplate_builder.cc
@@ -92,7 +92,7 @@ void AppendJsTemplateSourceHtml(std::string* output) {
   // fetch and cache the pointer of the jstemplate resource source text.
   static const base::StringPiece jstemplate_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_JSTEMPLATE_JS, ui::SCALE_FACTOR_NONE));
+          IDR_JSTEMPLATE_JS));
 
   if (jstemplate_src.empty()) {
     NOTREACHED() << "Unable to get jstemplate src";
@@ -118,10 +118,10 @@ void AppendI18nTemplateSourceHtml(std::string* output) {
   // fetch and cache the pointer of the jstemplate resource source text.
   static const base::StringPiece i18n_template_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_I18N_TEMPLATE_JS, ui::SCALE_FACTOR_NONE));
+          IDR_I18N_TEMPLATE_JS));
   static const base::StringPiece i18n_template2_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_I18N_TEMPLATE2_JS, ui::SCALE_FACTOR_NONE));
+          IDR_I18N_TEMPLATE2_JS));
   const base::StringPiece* template_src = g_version2 ?
       &i18n_template2_src : &i18n_template_src;
 
@@ -141,7 +141,7 @@ void AppendI18nTemplateProcessHtml(std::string* output) {
 
   static const base::StringPiece i18n_process_src(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_I18N_PROCESS_JS, ui::SCALE_FACTOR_NONE));
+          IDR_I18N_PROCESS_JS));
 
   if (i18n_process_src.empty()) {
     NOTREACHED() << "Unable to get i18n process src";
diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc
index db1a8ba..d83c9d6 100644
--- a/chrome/common/net/net_resource_provider.cc
+++ b/chrome/common/net/net_resource_provider.cc
@@ -41,7 +41,7 @@ struct LazyDirectoryListerCacher {
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
     html_data = jstemplate_builder::GetI18nTemplateHtml(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_DIR_HEADER_HTML, ui::SCALE_FACTOR_NONE),
+            IDR_DIR_HEADER_HTML),
         &value);
   }
 
@@ -58,8 +58,7 @@ base::StringPiece NetResourceProvider(int key) {
   if (IDR_DIR_HEADER_HTML == key)
     return base::StringPiece(lazy_dir_lister.html_data);
 
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      key, ui::SCALE_FACTOR_NONE);
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
 }
 
 }  // namespace chrome_common_net
diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc
index a2d1d7e..a0eb1aa 100644
--- a/chrome/common/web_apps.cc
+++ b/chrome/common/web_apps.cc
@@ -25,7 +25,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/dom_operations.h"
@@ -218,8 +217,7 @@ bool ParseWebAppFromDefinitionFile(Value* definition_value,
   scoped_ptr<Value> schema(
       base::JSONReader::ReadAndReturnError(
           ResourceBundle::GetSharedInstance().GetRawDataResource(
-              IDR_WEB_APP_SCHEMA,
-              ui::SCALE_FACTOR_NONE),
+              IDR_WEB_APP_SCHEMA),
           base::JSON_PARSE_RFC,  // options
           &error_code,
           &error_message));
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 2e700d9..dcd558b 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -726,7 +726,7 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(
 
     const base::StringPiece template_html(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
-            resource_id, ui::SCALE_FACTOR_NONE));
+            resource_id));
     if (template_html.empty()) {
       NOTREACHED() << "unable to load template. ID: " << resource_id;
     } else {
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index bf2ec59..64a975c 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -860,8 +860,7 @@ void Dispatcher::DidCreateDocumentElement(WebKit::WebFrame* frame) {
     // loaded in each app.
     frame->document().insertUserStyleSheet(
         WebString::fromUTF8(ResourceBundle::GetSharedInstance().
-            GetRawDataResource(IDR_PLATFORM_APP_CSS,
-                               ui::SCALE_FACTOR_NONE)),
+            GetRawDataResource(IDR_PLATFORM_APP_CSS)),
         WebDocument::UserStyleUserLevel);
   }
 }
diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc
index 9aaa459..848d885 100644
--- a/chrome/renderer/extensions/json_schema_unittest.cc
+++ b/chrome/renderer/extensions/json_schema_unittest.cc
@@ -9,7 +9,6 @@
 #include "chrome/test/base/v8_unit_test.h"
 #include "grit/renderer_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 static const char kJsonSchema[] = "json_schema.js";
@@ -26,7 +25,7 @@ class JsonSchemaTest : public V8UnitTest {
 
     // Add the json schema code to the context.
     std::string code = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_JSON_SCHEMA_JS, ui::SCALE_FACTOR_NONE).as_string();
+        IDR_JSON_SCHEMA_JS).as_string();
 
     // json_schema.js expects to have requireNative() defined.
     ExecuteScriptInContext(
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
index 7507ed1..4c6600f 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -31,7 +31,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using WebKit::WebFrame;
@@ -121,7 +120,7 @@ UserScriptSlave::UserScriptSlave(const ExtensionSet* extensions)
       script_deleter_(&scripts_),
       extensions_(extensions) {
   api_js_ = ResourceBundle::GetSharedInstance().GetRawDataResource(
-                IDR_GREASEMONKEY_API_JS, ui::SCALE_FACTOR_NONE);
+      IDR_GREASEMONKEY_API_JS);
 }
 
 UserScriptSlave::~UserScriptSlave() {}
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index bce80a8..4590a92 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -39,7 +39,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
@@ -107,7 +106,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMissingPlugin(
     const WebPluginParams& params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_BLOCKED_PLUGIN_HTML));
 
   DictionaryValue values;
   values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_SEARCHING));
@@ -138,7 +137,7 @@ PluginPlaceholder* PluginPlaceholder::CreateErrorPlugin(
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_BLOCKED_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_BLOCKED_PLUGIN_HTML));
   std::string html_data =
       jstemplate_builder::GetI18nTemplateHtml(template_html, &values);
 
@@ -170,7 +169,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin(
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          template_id, ui::SCALE_FACTOR_NONE));
+          template_id));
 
   DCHECK(!template_html.empty()) << "unable to load template. ID: "
                                  << template_id;
@@ -193,7 +192,7 @@ PluginPlaceholder* PluginPlaceholder::CreateMobileYoutubePlugin(
     const WebPluginParams& params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_MOBILE_YOUTUBE_PLUGIN_HTML, ui::SCALE_FACTOR_NONE));
+          IDR_MOBILE_YOUTUBE_PLUGIN_HTML));
 
   DictionaryValue values;
   values.SetString("video_id", GetYoutubeVideoId(params));
diff --git a/chrome/renderer/resource_bundle_source_map.cc b/chrome/renderer/resource_bundle_source_map.cc
index 86ee68d..5fab053 100644
--- a/chrome/renderer/resource_bundle_source_map.cc
+++ b/chrome/renderer/resource_bundle_source_map.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/resource_bundle_source_map.h"
 
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ResourceBundleSourceMap::ResourceBundleSourceMap(
@@ -26,7 +25,7 @@ v8::Handle<v8::Value> ResourceBundleSourceMap::GetSource(
     return v8::Undefined();
   int resource_id = resource_id_map_[name];
   return ConvertString(resource_bundle_->GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE));
+      resource_id));
 }
 
 bool ResourceBundleSourceMap::Contains(const std::string& name) {
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index 207ffe9..fda479f 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -730,7 +730,7 @@ bool SearchBoxExtension::PageSupportsInstant(WebKit::WebFrame* frame) {
 v8::Extension* SearchBoxExtension::Get() {
   const base::StringPiece code =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_SEARCHBOX_API, ui::SCALE_FACTOR_NONE);
+          IDR_SEARCHBOX_API);
   return new SearchBoxExtensionWrapper(code);
 }
 
diff --git a/chrome/test/base/module_system_test.cc b/chrome/test/base/module_system_test.cc
index 9a96676..1f7b75b 100644
--- a/chrome/test/base/module_system_test.cc
+++ b/chrome/test/base/module_system_test.cc
@@ -8,7 +8,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "chrome/renderer/extensions/native_handler.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include <map>
@@ -102,8 +101,7 @@ void ModuleSystemTest::RegisterModule(const std::string& name,
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       int resource_id) {
   const std::string& code = ResourceBundle::GetSharedInstance().
-      GetRawDataResource(resource_id,
-                         ui::SCALE_FACTOR_NONE).as_string();
+      GetRawDataResource(resource_id).as_string();
   source_map_->RegisterModule(name, code);
 }
 
diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc
index 72faa6c..dc29b3f 100644
--- a/content/shell/shell_browser_main_parts.cc
+++ b/content/shell/shell_browser_main_parts.cc
@@ -62,7 +62,7 @@ base::StringPiece PlatformResourceProvider(int key) {
   if (key == IDR_DIR_HEADER_HTML) {
     base::StringPiece html_data =
         ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_DIR_HEADER_HTML, ui::SCALE_FACTOR_NONE);
+            IDR_DIR_HEADER_HTML);
     return html_data;
   }
   return base::StringPiece();
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index eb951d4..f6c68bb 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -34,7 +34,7 @@ string16 ShellContentClient::GetLocalizedString(int message_id) const {
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/shell_devtools_delegate.cc
index 1d3629e..b5e8730 100644
--- a/content/shell/shell_devtools_delegate.cc
+++ b/content/shell/shell_devtools_delegate.cc
@@ -11,7 +11,6 @@
 #include "content/shell/shell.h"
 #include "grit/shell_resources.h"
 #include "net/base/tcp_listen_socket.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
@@ -50,8 +49,7 @@ void ShellDevToolsDelegate::Stop() {
 
 std::string ShellDevToolsDelegate::GetDiscoveryPageHTML() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE,
-      ui::SCALE_FACTOR_NONE).as_string();
+      IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
 }
 
 bool ShellDevToolsDelegate::BundlesFrontendResources() {
diff --git a/content/shell/webkit_test_runner_bindings.cc b/content/shell/webkit_test_runner_bindings.cc
index 6d1eb6f..0338124 100644
--- a/content/shell/webkit_test_runner_bindings.cc
+++ b/content/shell/webkit_test_runner_bindings.cc
@@ -11,7 +11,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerInfo.h"
-#include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using WebKit::WebFrame;
@@ -24,7 +23,7 @@ namespace {
 
 base::StringPiece GetStringResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE);
+      resource_id);
 }
 
 RenderView* GetCurrentRenderView() {
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 7582b24..db6cb55 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -391,6 +391,11 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
 }
 
 base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
+    int resource_id) const {
+  return LoadDataResourceBytesForScale(resource_id, ui::SCALE_FACTOR_NONE);
+}
+
+base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytesForScale(
     int resource_id,
     ScaleFactor scale_factor) const {
   base::RefCountedStaticMemory* bytes = NULL;
@@ -398,7 +403,8 @@ base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
     bytes = delegate_->LoadDataResourceBytes(resource_id, scale_factor);
 
   if (!bytes) {
-    base::StringPiece data = GetRawDataResource(resource_id, scale_factor);
+    base::StringPiece data =
+        GetRawDataResourceForScale(resource_id, scale_factor);
     if (!data.empty()) {
       bytes = new base::RefCountedStaticMemory(
           reinterpret_cast<const unsigned char*>(data.data()), data.length());
@@ -408,7 +414,11 @@ base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
   return bytes;
 }
 
-base::StringPiece ResourceBundle::GetRawDataResource(
+base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) const {
+  return GetRawDataResourceForScale(resource_id, ui::SCALE_FACTOR_NONE);
+}
+
+base::StringPiece ResourceBundle::GetRawDataResourceForScale(
     int resource_id,
     ScaleFactor scale_factor) const {
   base::StringPiece data;
@@ -452,7 +462,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {
   if (!locale_resources_data_->GetStringPiece(message_id, &data)) {
     // Fall back on the main data pack (shouldn't be any strings here except in
     // unittests).
-    data = GetRawDataResource(message_id, ui::SCALE_FACTOR_NONE);
+    data = GetRawDataResource(message_id);
     if (data.empty()) {
       NOTREACHED() << "unable to find resource: " << message_id;
       return string16();
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index d13b8cc..49657a1 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -201,19 +201,28 @@ class UI_EXPORT ResourceBundle {
   // Same as GetNativeImageNamed() except that RTL is not enabled.
   gfx::Image& GetNativeImageNamed(int resource_id);
 
+  // Loads the raw bytes of a scale independent data resource.
+  base::RefCountedStaticMemory* LoadDataResourceBytes(int resource_id) const;
+
   // Loads the raw bytes of a data resource nearest the scale factor
-  // |scale_factor| into |bytes|, without doing any processing or interpretation
-  // of the resource. Use ResourceHandle::SCALE_FACTOR_NONE for non-image
-  // resources. Returns NULL if we fail to read the resource.
-  base::RefCountedStaticMemory* LoadDataResourceBytes(
+  // |scale_factor| into |bytes|, without doing any processing or
+  // interpretation of the resource. Use ResourceHandle::SCALE_FACTOR_NONE
+  // for scale independent image resources (such as wallpaper).
+  // Returns NULL if we fail to read the resource.
+  base::RefCountedStaticMemory* LoadDataResourceBytesForScale(
       int resource_id,
       ScaleFactor scale_factor) const;
 
+  // Return the contents of a scale independent resource in a
+  // StringPiece given the resource id
+  base::StringPiece GetRawDataResource(int resource_id) const;
+
   // Return the contents of a resource in a StringPiece given the resource id
   // nearest the scale factor |scale_factor|.
-  // Use ResourceHanlde::SCALE_FACTOR_NONE for non-image resources.
-  base::StringPiece GetRawDataResource(int resource_id,
-                                       ScaleFactor scale_factor) const;
+  // Use ResourceHanlde::SCALE_FACTOR_NONE for scale independent image resources
+  // (such as wallpaper).
+  base::StringPiece GetRawDataResourceForScale(int resource_id,
+                                               ScaleFactor scale_factor) const;
 
   // Get a localized string given a message id.  Returns an empty
   // string if the message_id is not found.
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index 1d5d1e3..7040f9e 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -89,7 +89,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
 
   if (image.IsEmpty()) {
     scoped_refptr<base::RefCountedStaticMemory> data(
-        LoadDataResourceBytes(resource_id, SCALE_FACTOR_100P));
+        LoadDataResourceBytesForScale(resource_id, SCALE_FACTOR_100P));
     GdkPixbuf* pixbuf = LoadPixbuf(data.get(), rtl == RTL_ENABLED);
 
     if (!pixbuf) {
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
index 6ddc38b..06da17d 100644
--- a/ui/base/resource/resource_bundle_ios.mm
+++ b/ui/base/resource/resource_bundle_ios.mm
@@ -113,7 +113,7 @@ gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
     ui::ScaleFactor scale_factor = supported_scale_factors[0];
 
     scoped_refptr<base::RefCountedStaticMemory> data(
-        LoadDataResourceBytes(resource_id, scale_factor));
+        LoadDataResourceBytesForScale(resource_id, scale_factor));
 
     // Create a data object from the raw bytes.
     scoped_nsobject<NSData> ns_data(
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index df3a369..eadfd9e 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -187,7 +187,7 @@ TEST(ResourceBundle, DelegateLoadDataResourceBytes) {
       .WillOnce(Return(static_memory));
 
   scoped_refptr<base::RefCountedStaticMemory> result =
-      resource_bundle.LoadDataResourceBytes(resource_id, scale_factor);
+      resource_bundle.LoadDataResourceBytesForScale(resource_id, scale_factor);
   EXPECT_EQ(static_memory, result);
 }
 
@@ -207,7 +207,7 @@ TEST(ResourceBundle, DelegateGetRawDataResource) {
       .WillOnce(Return(string_piece));
 
   base::StringPiece result = resource_bundle.GetRawDataResource(
-      resource_id, ui::SCALE_FACTOR_NONE);
+      resource_id);
   EXPECT_EQ(string_piece.data(), result.data());
 }
 
@@ -267,14 +267,14 @@ TEST(ResourceBundle, LoadDataResourceBytes) {
 
     const int kUnfoundResourceId = 10000;
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
+        kUnfoundResourceId));
 
     // Give a .pak file that doesn't exist so we will fail to load it.
     resource_bundle.AddDataPackFromPath(
         FilePath(FILE_PATH_LITERAL("non-existant-file.pak")),
         ui::SCALE_FACTOR_NONE);
     EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId, ui::SCALE_FACTOR_NONE));
+        kUnfoundResourceId));
   }
 }
 
@@ -304,16 +304,16 @@ TEST(ResourceBundle, GetRawDataResource) {
 
     // Resource ID 4 exists in both 1x and 2x paks, so we expect a different
     // result when requesting the 2x scale.
-    EXPECT_EQ("this is id 4", resource_bundle.GetRawDataResource(4,
+    EXPECT_EQ("this is id 4", resource_bundle.GetRawDataResourceForScale(4,
         SCALE_FACTOR_100P));
-    EXPECT_EQ("this is id 4 2x", resource_bundle.GetRawDataResource(4,
+    EXPECT_EQ("this is id 4 2x", resource_bundle.GetRawDataResourceForScale(4,
         SCALE_FACTOR_200P));
 
     // Resource ID 6 only exists in the 1x pak so we expect the same resource
     // for both scale factor requests.
-    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
+    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResourceForScale(6,
         SCALE_FACTOR_100P));
-    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResource(6,
+    EXPECT_EQ("this is id 6", resource_bundle.GetRawDataResourceForScale(6,
         SCALE_FACTOR_200P));
   }
 }
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 278e517..581f230d 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -118,6 +118,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     }
   }
 
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc
index 0ee9310..fa795f9 100644
--- a/webkit/support/platform_support_linux.cc
+++ b/webkit/support/platform_support_linux.cc
@@ -71,6 +71,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(
     }
   }
 
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 82c3573..58093c4 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -560,8 +560,7 @@ void TestShell::ShowStartupDebuggingDialog() {
 
 // static
 base::StringPiece TestShell::ResourceProvider(int key) {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      key, ui::SCALE_FACTOR_NONE);
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
 }
 
 //-----------------------------------------------------------------------------