Renaming DecompressData resource bundle functions

This changes the paradigm on retrieving resources. Before, for these functions,
you needed to know whether your resources were compressed to know to call the
right function.

Now, we can call it without knowing if there is decompression under the covers.
This also allows others to use std::string return types for convenience, even
if they don't use compression.

TBR: trivial renaming outside of reviewed area
Bug: 1003433
Change-Id: I0200d083d4a2d8f8fef98591e9c2e4188488a471
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1874514
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711469}

android_webview/renderer/aw_content_renderer_client.cc

@@ -250,7 +250,7 @@ void AwContentRendererClient::PrepareErrorPage(
   else
     replacements.push_back("");
   *error_html = base::ReplaceStringPlaceholders(
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_AW_LOAD_ERROR_HTML),
       replacements, nullptr);
 }

chrome/browser/android/devtools_manager_delegate_android.cc

@@ -252,7 +252,7 @@ DevToolsManagerDelegateAndroid::CreateNewTarget(const GURL& url) {
 }
 
 std::string DevToolsManagerDelegateAndroid::GetDiscoveryPageHTML() {
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DEVTOOLS_DISCOVERY_PAGE_HTML);
 }
 

chrome/browser/dev_ui/android/dev_ui_loader_error_page.cc

@@ -25,7 +25,7 @@ std::string BuildErrorPageHtml() {
       l10n_util::GetStringUTF8(IDS_DEV_UI_LOADER_ERROR_SUGGEST_CHECK_INTERNET);
 
   std::string source =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_DEV_UI_LOADER_ERROR_HTML);
   return ui::ReplaceTemplateExpressions(source, replacements);
 }

chrome/browser/devtools/chrome_devtools_manager_delegate.cc

@@ -227,7 +227,7 @@ ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
 }
 
 std::string ChromeDevToolsManagerDelegate::GetDiscoveryPageHTML() {
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DEVTOOLS_DISCOVERY_PAGE_HTML);
 }
 

chrome/browser/safe_browsing/test_safe_browsing_blocking_page_quiet.cc

@@ -62,7 +62,7 @@ std::string TestSafeBrowsingBlockingPageQuiet::GetHTML() {
   webui::SetLoadTimeDataDefaults(controller()->GetApplicationLocale(),
                                  &load_time_data);
   std::string html =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_SECURITY_INTERSTITIAL_QUIET_HTML);
   webui::AppendWebUiCssTextDefaults(&html);
   html = webui::GetI18nTemplateHtml(html, &load_time_data);

chrome/browser/ssl/ssl_error_assistant.cc

@@ -318,7 +318,7 @@ SSLErrorAssistant::GetErrorAssistantProtoFromResourceBundle() {
   auto proto = std::make_unique<chrome_browser_ssl::SSLErrorAssistantConfig>();
   DCHECK(proto);
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  std::string data = bundle.DecompressDataResource(IDR_SSL_ERROR_ASSISTANT_PB);
+  std::string data = bundle.LoadDataResourceString(IDR_SSL_ERROR_ASSISTANT_PB);
   return proto->ParseFromString(data) ? std::move(proto) : nullptr;
 }
 

chrome/browser/supervised_user/supervised_user_error_page/supervised_user_error_page.cc

@@ -172,7 +172,7 @@ std::string BuildHtml(bool allow_access_requests,
   strings.SetString("requestFailedMessage", request_failed_message);
   webui::SetLoadTimeDataDefaults(app_locale, &strings);
   std::string html =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML);
   webui::AppendWebUiCssTextDefaults(&html);
   std::string error_html = webui::GetI18nTemplateHtml(html, &strings);

chrome/browser/ui/webui/about_ui.cc

@@ -412,7 +412,7 @@ class ChromeOSCreditsHandler
     // If we fail to load Chrome OS credits from disk, load it from resources.
     if (contents_.empty() && path_ != kKeyboardUtilsPath) {
       contents_ =
-          ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+          ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
               IDR_OS_CREDITS_HTML);
     }
     callback_.Run(base::RefCountedString::TakeString(&contents_));
@@ -482,7 +482,7 @@ class LinuxCreditsHandler
     // TODO(rjwright): Add a linux-specific placeholder in resources.
     if (contents_.empty() && path_ != kKeyboardUtilsPath) {
       contents_ =
-          ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+          ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
               IDR_OS_CREDITS_HTML);
     }
     callback_.Run(base::RefCountedString::TakeString(&contents_));
@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest(
       response = about_ui::GetCredits(true /*include_scripts*/);
     } else {
       response =
-          ui::ResourceBundle::GetSharedInstance().DecompressDataResource(idr);
+          ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
     }
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {

chrome/browser/ui/webui/interstitials/interstitial_ui.cc

@@ -524,7 +524,7 @@ void InterstitialHTMLSource::StartDataRequest(
   } else if (interstitial_delegate.get()) {
     html = interstitial_delegate.get()->GetHTMLContents();
   } else {
-    html = ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+    html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
         IDR_SECURITY_INTERSTITIAL_UI_HTML);
   }
   scoped_refptr<base::RefCountedString> html_bytes = new base::RefCountedString;

chrome/common/net/net_resource_provider.cc

@@ -42,7 +42,7 @@ struct LazyDirectoryListerCacher {
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
     value.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
     std::string str = webui::GetI18nTemplateHtml(
-        ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
             IDR_DIR_HEADER_HTML),
         &value);
 

chrome/renderer/net/net_error_helper.cc

@@ -385,7 +385,7 @@ LocalizedError::PageState NetErrorHelper::GenerateLocalizedErrorPage(
 
   int resource_id = IDR_NET_ERROR_HTML;
   std::string extracted_string =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           resource_id);
   base::StringPiece template_html(extracted_string.data(),
                                   extracted_string.size());

chrome/renderer/translate/translate_script_browsertest.cc

@@ -80,7 +80,7 @@ class TranslateScriptBrowserTest : public ChromeRenderViewTest {
  protected:
   void InjectElementLibrary() {
     std::string script =
-        ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
             IDR_TRANSLATE_JS);
     script += kElementJs;
     ExecuteScript(script);

components/about_ui/credit_utils.cc

@@ -14,7 +14,7 @@ namespace about_ui {
 
 std::string GetCredits(bool include_scripts) {
   std::string response =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_ABOUT_UI_CREDITS_HTML);
   if (include_scripts) {
     response +=

components/dom_distiller/content/browser/distillable_page_utils.cc

@@ -43,7 +43,7 @@ void IsDistillablePageForDetector(content::WebContents* web_contents,
     return;
   }
   std::string extract_features_js =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_EXTRACT_PAGE_FEATURES_JS);
   RunIsolatedJavaScript(
       main_frame, extract_features_js,

components/dom_distiller/core/distillable_page_detector.cc

@@ -17,7 +17,7 @@ const DistillablePageDetector* DistillablePageDetector::GetNewModel() {
   static DistillablePageDetector* detector = nullptr;
   if (!detector) {
     std::string serialized_proto =
-        ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
             IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW);
     std::unique_ptr<AdaBoostProto> proto(new AdaBoostProto);
     CHECK(proto->ParseFromString(serialized_proto));
@@ -30,7 +30,7 @@ const DistillablePageDetector* DistillablePageDetector::GetLongPageModel() {
   static DistillablePageDetector* detector = nullptr;
   if (!detector) {
     std::string serialized_proto =
-        ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
             IDR_LONG_PAGE_SERIALIZED_MODEL);
     std::unique_ptr<AdaBoostProto> proto(new AdaBoostProto);
     CHECK(proto->ParseFromString(serialized_proto));

components/dom_distiller/core/distiller_page.cc

@@ -35,7 +35,7 @@ std::string GetDistillerScriptWithOptions(
     const dom_distiller::proto::DomDistillerOptions& options,
     bool stringify_output) {
   std::string script =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_DISTILLER_JS);
   if (script.empty()) {
     return "";

components/dom_distiller/core/viewer.cc

@@ -58,15 +58,15 @@ const char kMonospaceCssClass[] = "monospace";
 std::string GetPlatformSpecificCss() {
 #if defined(OS_IOS)
   return base::StrCat(
-      {ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      {ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
            IDR_DISTILLER_MOBILE_CSS),
-       ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+       ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
            IDR_DISTILLER_IOS_CSS)});
 #elif defined(OS_ANDROID)
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DISTILLER_MOBILE_CSS);
 #else  // Desktop
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DISTILLER_DESKTOP_CSS);
 #endif
 }
@@ -120,7 +120,7 @@ std::string ReplaceHtmlTemplateValues(
     const DistilledPagePrefs::Theme theme,
     const DistilledPagePrefs::FontFamily font_family) {
   std::string html_template =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_DOM_DISTILLER_VIEWER_HTML);
   std::vector<std::string> substitutions;
 
@@ -233,18 +233,18 @@ const std::string GetUnsafeArticleContentJs(
 
 const std::string GetCss() {
   return base::StrCat(
-      {ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      {ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
            IDR_DISTILLER_CSS),
        GetPlatformSpecificCss()});
 }
 
 const std::string GetLoadingImage() {
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DISTILLER_LOADING_IMAGE);
 }
 
 const std::string GetJavaScript() {
-  return ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
       IDR_DOM_DISTILLER_VIEWER_JS);
 }
 

components/ntp_tiles/popular_sites_impl.cc

@@ -221,7 +221,7 @@ base::Value DefaultPopularSites() {
   }
   std::unique_ptr<base::ListValue> sites =
       base::ListValue::From(base::JSONReader::ReadDeprecated(
-          ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+          ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
               IDR_DEFAULT_POPULAR_SITES_JSON)));
   DCHECK(sites);
   for (base::Value& site : *sites) {

components/offline_pages/core/renovations/page_renovation_loader.cc

@@ -85,7 +85,7 @@ bool PageRenovationLoader::LoadSource() {
   // Our script file is stored in the resource bundle. Get this script.
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   combined_source_ = base::UTF8ToUTF16(
-      rb.DecompressDataResource(IDR_OFFLINE_PAGES_RENOVATIONS_JS));
+      rb.LoadDataResourceString(IDR_OFFLINE_PAGES_RENOVATIONS_JS));
 
   // If built correctly, IDR_OFFLINE_PAGES_RENOVATIONS_JS should
   // always exist in the resource pack and loading should never fail.

components/omnibox/browser/omnibox_pedal_provider.cc

@@ -96,7 +96,7 @@ OmniboxPedal::Tokens OmniboxPedalProvider::Tokenize(
 void OmniboxPedalProvider::LoadPedalConcepts() {
   // Load concept data then parse to base::Value in order to construct Pedals.
   std::string uncompressed_data =
-      ui::ResourceBundle::GetSharedInstance().DecompressLocalizedDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadLocalizedResourceString(
           IDR_OMNIBOX_PEDAL_CONCEPTS);
   const auto concept_data = base::JSONReader::Read(uncompressed_data);
 

components/printing/renderer/print_render_frame_helper.cc

@@ -735,7 +735,7 @@ void PrintRenderFrameHelper::PrintHeaderAndFooter(
   blink::WebFrameWidget::CreateForMainFrame(&web_widget_client, frame);
 
   base::Value html(
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_PRINT_HEADER_FOOTER_TEMPLATE_PAGE));
   // Load page with script to avoid async operations.
   ExecuteScript(frame, kPageLoadScriptFormat, html);

components/security_interstitials/content/security_interstitial_page.cc

@@ -76,7 +76,7 @@ std::string SecurityInterstitialPage::GetHTMLContents() {
   webui::SetLoadTimeDataDefaults(controller()->GetApplicationLocale(),
                                  &load_time_data);
   std::string html =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           GetHTMLTemplateId());
 
   webui::AppendWebUiCssTextDefaults(&html);

components/translate/core/browser/translate_script.cc

@@ -154,7 +154,7 @@ void TranslateScript::OnScriptFetchComplete(bool success,
         &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
 
     // Load embedded translate.js.
-    data_.append(ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+    data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
         IDR_TRANSLATE_JS));
 
 #if defined(OS_IOS)

components/translate/ios/browser/js_translate_manager_unittest.mm

@@ -22,7 +22,7 @@ class JsTranslateManagerTest : public PlatformTest {
     receiver_ = [[CRWTestJSInjectionReceiver alloc] init];
     manager_ = [[JsTranslateManager alloc] initWithReceiver:receiver_];
     std::string script =
-        ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
             IDR_TRANSLATE_JS);
     [manager_ setScript:base::SysUTF8ToNSString(script + "('DummyKey');")];
   }

ios/chrome/browser/interstitials/ios_security_interstitial_page.mm

@@ -70,7 +70,7 @@ std::string IOSSecurityInterstitialPage::GetHtmlContents() const {
       GetApplicationContext()->GetApplicationLocale(), &load_time_data);
   AdjustFontSize(load_time_data);
   std::string html =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_SECURITY_INTERSTITIAL_HTML);
   webui::AppendWebUiCssTextDefaults(&html);
   return webui::GetI18nTemplateHtml(html, &load_time_data);

ios/chrome/browser/ui/webui/about_ui.cc

@@ -123,7 +123,7 @@ void AboutUIHTMLSource::StartDataRequest(
       idr = IDR_ABOUT_UI_CREDITS_JS;
     ui::ResourceBundle& resource_instance =
         ui::ResourceBundle::GetSharedInstance();
-    response = resource_instance.DecompressDataResource(idr);
+    response = resource_instance.LoadDataResourceString(idr);
   } else if (source_name_ == kChromeUIHistogramHost) {
     // Note: On other platforms, this is implemented in //content. If there is
     // ever a need for embedders other than //ios/chrome to use

ios/chrome/browser/web/error_page_util.mm

@@ -59,7 +59,7 @@ NSString* GetErrorPage(const GURL& url,
       ui::ResourceBundle::GetSharedInstance().GetMaxScaleFactor();
 
   std::string extracted_string =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResourceScaled(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceStringForScale(
           IDR_NET_ERROR_HTML, scale_factor);
   base::StringPiece template_html(extracted_string.data(),
                                   extracted_string.size());

ui/base/resource/resource_bundle.cc

@@ -149,15 +149,15 @@ bool BrotliDecompress(base::StringPiece input, std::string* output) {
 }
 
 // Helper function for decompressing resource.
-void Decompress(base::StringPiece data, std::string* output) {
-  if (HasGzipHeader(data)) {
+void DecompressIfNeeded(base::StringPiece data, std::string* output) {
+  if (!data.empty() && HasGzipHeader(data)) {
     bool success = compression::GzipUncompress(data, output);
     DCHECK(success);
-  } else if (HasBrotliHeader(data)) {
+  } else if (!data.empty() && HasBrotliHeader(data)) {
     bool success = BrotliDecompress(data, output);
     DCHECK(success);
   } else {
-    NOTREACHED() << "Resource is not compressed";
+    data.CopyToString(output);
   }
 }
 
@@ -588,7 +588,7 @@ base::RefCountedMemory* ResourceBundle::LoadDataResourceBytesForScale(
     if (!data.empty()) {
       if (HasGzipHeader(data) || HasBrotliHeader(data)) {
         base::RefCountedString* bytes_string = new base::RefCountedString();
-        Decompress(data, &(bytes_string->data()));
+        DecompressIfNeeded(data, &(bytes_string->data()));
         bytes = bytes_string;
       } else {
         bytes = new base::RefCountedStaticMemory(data.data(), data.length());
@@ -632,20 +632,20 @@ base::StringPiece ResourceBundle::GetRawDataResourceForScale(
   return base::StringPiece();
 }
 
-std::string ResourceBundle::DecompressDataResource(int resource_id) const {
-  return DecompressDataResourceScaled(resource_id, ui::SCALE_FACTOR_NONE);
+std::string ResourceBundle::LoadDataResourceString(int resource_id) const {
+  return LoadDataResourceStringForScale(resource_id, ui::SCALE_FACTOR_NONE);
 }
 
-std::string ResourceBundle::DecompressDataResourceScaled(
+std::string ResourceBundle::LoadDataResourceStringForScale(
     int resource_id,
     ScaleFactor scaling_factor) const {
   std::string output;
-  Decompress(GetRawDataResourceForScale(resource_id, scaling_factor), &output);
+  DecompressIfNeeded(GetRawDataResourceForScale(resource_id, scaling_factor),
+                     &output);
   return output;
 }
 
-std::string ResourceBundle::DecompressLocalizedDataResource(
-    int resource_id) const {
+std::string ResourceBundle::LoadLocalizedResourceString(int resource_id) const {
   base::AutoLock lock_scope(*locale_resources_data_lock_);
   base::StringPiece data;
   if (!(locale_resources_data_.get() &&
@@ -661,7 +661,7 @@ std::string ResourceBundle::DecompressLocalizedDataResource(
     }
   }
   std::string output;
-  Decompress(data, &output);
+  DecompressIfNeeded(data, &output);
   return output;
 }
 

ui/base/resource/resource_bundle.h

@@ -254,16 +254,16 @@ class UI_BASE_EXPORT ResourceBundle {
   // into a newly allocated string given the resource id. Todo: Look into
   // introducing an Async version of this function in the future.
   // Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=973417
-  std::string DecompressDataResource(int resource_id) const;
+  std::string LoadDataResourceString(int resource_id) const;
 
   // Return the contents of a scale dependent resource, decompressed into
   // a newly allocated string given the resource id.
-  std::string DecompressDataResourceScaled(int resource_id,
-                                           ScaleFactor scaling_factor) const;
+  std::string LoadDataResourceStringForScale(int resource_id,
+                                             ScaleFactor scaling_factor) const;
 
   // Return the contents of a localized resource, decompressed into a
   // newly allocated string given the resource id.
-  std::string DecompressLocalizedDataResource(int resource_id) const;
+  std::string LoadLocalizedResourceString(int resource_id) const;
 
   // Get a localized string given a message id.  Returns an empty string if the
   // resource_id is not found.

ui/base/resource/resource_bundle_unittest.cc

@@ -457,7 +457,7 @@ TEST_F(ResourceBundleImageTest, LoadDataResourceBytesNotFound) {
             resource_bundle->LoadDataResourceBytes(kUnfoundResourceId));
 }
 
-TEST_F(ResourceBundleImageTest, DecompressDataResourceScaled) {
+TEST_F(ResourceBundleImageTest, LoadDataResourceStringForScale) {
   base::FilePath data_path = dir_path().Append(FILE_PATH_LITERAL("sample.pak"));
   base::FilePath data_2x_path =
       dir_path().Append(FILE_PATH_LITERAL("sample_2x.pak"));
@@ -477,13 +477,13 @@ TEST_F(ResourceBundleImageTest, DecompressDataResourceScaled) {
 
   // Resource ID 6 is brotlied and exists in both 1x and 2x paks, so we expect a
   // different result when requesting the 2x scale.
-  EXPECT_EQ("this is id 6", resource_bundle->DecompressDataResourceScaled(
+  EXPECT_EQ("this is id 6", resource_bundle->LoadDataResourceStringForScale(
                                 6, SCALE_FACTOR_100P));
-  EXPECT_EQ("this is id 6 x2", resource_bundle->DecompressDataResourceScaled(
+  EXPECT_EQ("this is id 6 x2", resource_bundle->LoadDataResourceStringForScale(
                                    6, SCALE_FACTOR_200P));
 }
 
-TEST_F(ResourceBundleImageTest, DecompressLocalizedDataResource) {
+TEST_F(ResourceBundleImageTest, LoadLocalizedResourceString) {
   base::FilePath data_path = dir_path().Append(FILE_PATH_LITERAL("sample.pak"));
   // Dump content into pak file.
   ASSERT_EQ(base::WriteFile(data_path, kSampleCompressPakContentsV5,
@@ -494,13 +494,11 @@ TEST_F(ResourceBundleImageTest, DecompressLocalizedDataResource) {
   resource_bundle->AddDataPackFromPath(data_path, SCALE_FACTOR_NONE);
   resource_bundle->OverrideLocalePakForTest(data_path);
 
-  EXPECT_EQ("this is id 6",
-            resource_bundle->DecompressLocalizedDataResource(6));
-  EXPECT_EQ("this is id 8",
-            resource_bundle->DecompressLocalizedDataResource(8));
+  EXPECT_EQ("this is id 6", resource_bundle->LoadLocalizedResourceString(6));
+  EXPECT_EQ("this is id 8", resource_bundle->LoadLocalizedResourceString(8));
 }
 
-TEST_F(ResourceBundleImageTest, DecompressDataResource) {
+TEST_F(ResourceBundleImageTest, LoadDataResourceString) {
   base::FilePath data_path = dir_path().Append(FILE_PATH_LITERAL("sample.pak"));
   // Dump content into pak file.
   ASSERT_EQ(base::WriteFile(data_path, kSampleCompressPakContentsV5,
@@ -511,10 +509,10 @@ TEST_F(ResourceBundleImageTest, DecompressDataResource) {
   resource_bundle->AddDataPackFromPath(data_path, SCALE_FACTOR_NONE);
 
   // Resource ID 6 is Brotli compressed, expect it to be uncompressed.
-  EXPECT_EQ("this is id 6", resource_bundle->DecompressDataResource(6));
+  EXPECT_EQ("this is id 6", resource_bundle->LoadDataResourceString(6));
 
   // Resource ID 8 is Gzip compressed, expect it to be uncompressed.
-  EXPECT_EQ("this is id 8", resource_bundle->DecompressDataResource(8));
+  EXPECT_EQ("this is id 8", resource_bundle->LoadDataResourceString(8));
 }
 
 TEST_F(ResourceBundleImageTest, GetRawDataResource) {

ui/base/webui/jstemplate_builder.cc

@@ -39,7 +39,7 @@ void AppendJsonHtml(const base::DictionaryValue* json, std::string* output) {
 void AppendLoadTimeData(std::string* output) {
   // fetch and cache the pointer of the jstemplate resource source text.
   std::string load_time_data_src =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_WEBUI_JS_LOAD_TIME_DATA);
 
   if (load_time_data_src.empty()) {
@@ -56,7 +56,7 @@ void AppendLoadTimeData(std::string* output) {
 void AppendJsTemplateSourceHtml(std::string* output) {
   // fetch and cache the pointer of the jstemplate resource source text.
   std::string jstemplate_src =
-      ui::ResourceBundle::GetSharedInstance().DecompressDataResource(
+      ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
           IDR_WEBUI_JSTEMPLATE_JS);
 
   if (jstemplate_src.empty()) {

ui/base/webui/web_ui_util.cc

@@ -206,14 +206,14 @@ std::string GetWebUiCssTextDefaults() {
   const ui::ResourceBundle& resource_bundle =
       ui::ResourceBundle::GetSharedInstance();
   return GetWebUiCssTextDefaults(
-      resource_bundle.DecompressDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS));
+      resource_bundle.LoadDataResourceString(IDR_WEBUI_CSS_TEXT_DEFAULTS));
 }
 
 std::string GetWebUiCssTextDefaultsMd() {
   const ui::ResourceBundle& resource_bundle =
       ui::ResourceBundle::GetSharedInstance();
   return GetWebUiCssTextDefaults(
-      resource_bundle.DecompressDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD));
+      resource_bundle.LoadDataResourceString(IDR_WEBUI_CSS_TEXT_DEFAULTS_MD));
 }
 
 void AppendWebUiCssTextDefaults(std::string* html) {