Refer to ui::ResourceBundle with namespace in various dirs.

ResourceBundle became ui::ResourceBundle in r72038 but many callers
still refer to it without the namespace.

Change-Id: I920e21319041cd0e2a2fa671db709a9d8483fb2e
Reviewed-on: https://chromium-review.googlesource.com/701662Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506826}

android_webview/browser/aw_content_browser_client.cc

@@ -88,7 +88,7 @@ namespace {
 // This class filters out incoming aw_contents related IPC messages for the
 // renderer process on the IPC thread.
 class AwContentsMessageFilter : public content::BrowserMessageFilter {
-public:
+ public:
   explicit AwContentsMessageFilter(int process_id);
 
   // BrowserMessageFilter methods.
@@ -104,8 +104,8 @@ public:
                                   bool* ignore_navigation);
   void OnSubFrameCreated(int parent_render_frame_id, int child_render_frame_id);
 
-private:
- ~AwContentsMessageFilter() override;
+ private:
+  ~AwContentsMessageFilter() override;
 
   int process_id_;
 
@@ -297,7 +297,7 @@ std::string AwContentBrowserClient::GetAcceptLangs(
 }
 
 const gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // TODO(boliu): Bundle our own default favicon?
   return rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
 }

android_webview/common/aw_content_client.cc

@@ -66,7 +66,7 @@ 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().GetRawDataResourceForScale(
+  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 

android_webview/lib/aw_main_delegate.cc

@@ -179,8 +179,8 @@ void AwMainDelegate::PreSandboxStartup() {
     int pak_fd = global_descriptors->Get(kAndroidWebViewLocalePakDescriptor);
     base::MemoryMappedFile::Region pak_region =
         global_descriptors->GetRegion(kAndroidWebViewLocalePakDescriptor);
-    ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
-                                                        pak_region);
+    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
+                                                            pak_region);
 
     std::pair<int, ui::ScaleFactor> extra_paks[] = {
         {kAndroidWebViewMainPakDescriptor, ui::SCALE_FACTOR_NONE},
@@ -189,7 +189,7 @@ void AwMainDelegate::PreSandboxStartup() {
     for (const auto& pak_info : extra_paks) {
       pak_fd = global_descriptors->Get(pak_info.first);
       pak_region = global_descriptors->GetRegion(pak_info.first);
-      ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
+      ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
           base::File(pak_fd), pak_region, pak_info.second);
     }
 

android_webview/renderer/aw_content_renderer_client.cc

@@ -273,7 +273,7 @@ void AwContentRendererClient::GetNavigationErrorStrings(
   else
     replacements.push_back("");
   *error_html = base::ReplaceStringPlaceholders(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
+      ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_AW_LOAD_ERROR_HTML),
       replacements, nullptr);
 }

ash/display/cursor_window_controller.cc

@@ -254,7 +254,7 @@ void CursorWindowController::UpdateCursorImage() {
     return;
   }
   const gfx::ImageSkia* image =
-      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
+      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   if (!is_cursor_compositing_enabled_) {
     gfx::ImageSkia rotated = *image;
     switch (display_.rotation()) {

ash/message_center/notifier_settings_view.cc

@@ -229,7 +229,7 @@ NotifierSettingsView::NotifierButton::NotifierButton(
     learn_more_->SetFocusPainter(CreateFocusPainter());
     learn_more_->SetFocusForPlatform();
 
-    ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     learn_more_->SetImage(
         views::Button::STATE_NORMAL,
         rb.GetImageSkiaNamed(IDR_NOTIFICATION_ADVANCED_SETTINGS));

ash/test/ash_interactive_ui_test_base.cc

@@ -46,7 +46,7 @@ void AshInteractiveUITestBase::SetUp() {
   PathService::Get(base::DIR_MODULE, &resources_pack_path);
   resources_pack_path =
       resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
-  ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       resources_pack_path, ui::SCALE_FACTOR_NONE);
   env_ = aura::Env::CreateInstance();
 

chromecast/browser/cast_content_browser_client.cc

@@ -570,7 +570,7 @@ void CastContentBrowserClient::RegisterInProcessServices(
 std::unique_ptr<base::Value>
 CastContentBrowserClient::GetServiceManifestOverlay(
     base::StringPiece service_name) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int id = -1;
   if (service_name == content::mojom::kBrowserServiceName)
     id = IDR_CAST_CONTENT_BROWSER_MANIFEST_OVERLAY;

chromecast/browser/devtools/cast_devtools_manager_delegate.cc

@@ -62,8 +62,9 @@ std::string CastDevToolsManagerDelegate::GetDiscoveryPageHTML() {
 #if defined(OS_ANDROID)
   return std::string();
 #else
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_CAST_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
+  return ui::ResourceBundle::GetSharedInstance()
+      .GetRawDataResource(IDR_CAST_SHELL_DEVTOOLS_DISCOVERY_PAGE)
+      .as_string();
 #endif
 }
 

ios/chrome/app/theme/ios_theme_resources.grd

 <?xml version="1.0" encoding="utf-8"?>
 <!-- This grd file contains images that are pre-scaled for device scale
-     factors. The image returned by |base::ResourceBundle::GetImageNamed|
-     will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
+     factors. The image returned by ui::ResourceBundle::GetImageNamed()
+     will contain multiple gfx:ImageSkiaReps for each scale factors. The
      |fallback_to_low_resolution| attribute controls behavior when
      an image file is missing for target scale factor. If true, chrome
      will automatically scale the 1x image to the target scale factor.

ios/chrome/browser/favicon/favicon_client_impl.mm

@@ -64,7 +64,7 @@ void GetFaviconBitmapForNativeURL(
     favicon_bitmap.icon_type = favicon_base::FAVICON;
     favicon_bitmap.pixel_size = candidate_sizes[selected_index];
     favicon_bitmap.bitmap_data =
-        ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
+        ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, scale_factor);
 
     if (!favicon_bitmap.is_valid())

ios/chrome/browser/interstitials/ios_security_interstitial_page.mm

@@ -47,7 +47,7 @@ std::string IOSSecurityInterstitialPage::GetHtmlContents() const {
   PopulateInterstitialStrings(&load_time_data);
   webui::SetLoadTimeDataDefaults(
       GetApplicationContext()->GetApplicationLocale(), &load_time_data);
-  std::string html = ResourceBundle::GetSharedInstance()
+  std::string html = ui::ResourceBundle::GetSharedInstance()
                          .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)
                          .as_string();
   webui::AppendWebUiCssTextDefaults(&html);

ios/chrome/browser/ios_chrome_main_parts.mm

@@ -76,13 +76,13 @@ IOSChromeMainParts::~IOSChromeMainParts() {}
 void IOSChromeMainParts::PreMainMessageLoopStart() {
   l10n_util::OverrideLocaleWithCocoaLocale();
   const std::string loaded_locale =
-      ResourceBundle::InitSharedInstanceWithLocale(
-          std::string(), nullptr, ResourceBundle::LOAD_COMMON_RESOURCES);
+      ui::ResourceBundle::InitSharedInstanceWithLocale(
+          std::string(), nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
   CHECK(!loaded_locale.empty());
 
   base::FilePath resources_pack_path;
   PathService::Get(ios::FILE_RESOURCES_PACK, &resources_pack_path);
-  ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       resources_pack_path, ui::SCALE_FACTOR_100P);
 }
 

ios/chrome/browser/ui/page_info/page_info_model.cc

@@ -155,7 +155,7 @@ PageInfoModel::SectionInfo PageInfoModel::GetSectionInfo(int index) {
 }
 
 gfx::Image* PageInfoModel::GetIconImage(SectionStateIcon icon_id) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   switch (icon_id) {
     case ICON_NONE:
     case ICON_STATE_INTERNAL_PAGE:

ios/chrome/browser/ui/static_content/static_html_view_controller.mm

@@ -38,7 +38,7 @@
 
 - (void)generateHtml:(HtmlCallback)callback {
   base::StringPiece html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(resourceId_));
+      ui::ResourceBundle::GetSharedInstance().GetRawDataResource(resourceId_));
   NSString* result = [[NSString alloc] initWithBytes:html.data()
                                               length:html.size()
                                             encoding:encoding_];

ios/chrome/browser/ui/uikit_ui_util.mm

@@ -230,7 +230,7 @@ BOOL ImageHasAlphaChannel(UIImage* image) {
 
 UIImage* NativeReversableImage(int imageID, BOOL reversable) {
   DCHECK(imageID);
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   UIImage* image = rb.GetNativeImageNamed(imageID).ToUIImage();
   return (reversable && UseRTLLayout())
              ? [image imageFlippedForRightToLeftLayoutDirection]

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

@@ -33,7 +33,7 @@ const char kStringsJsPath[] = "strings.js";
 class AboutUIHTMLSource : public web::URLDataSourceIOS {
  public:
   // Construct a data source for the specified |source_name|.
-  AboutUIHTMLSource(const std::string& source_name);
+  explicit AboutUIHTMLSource(const std::string& source_name);
 
   // web::URLDataSourceIOS implementation.
   std::string GetSource() const override;
@@ -129,7 +129,7 @@ void AboutUIHTMLSource::StartDataRequest(
     if (path == kCreditsJsPath)
       idr = IDR_ABOUT_UI_CREDITS_JS;
     base::StringPiece raw_response =
-        ResourceBundle::GetSharedInstance().GetRawDataResource(idr);
+        ui::ResourceBundle::GetSharedInstance().GetRawDataResource(idr);
     if (idr == IDR_ABOUT_UI_CREDITS_HTML) {
       const uint8_t* next_encoded_byte =
           reinterpret_cast<const uint8_t*>(raw_response.data());

ios/chrome/browser/web/chrome_web_client.mm

@@ -143,13 +143,14 @@ base::string16 ChromeWebClient::GetLocalizedString(int message_id) const {
 base::StringPiece ChromeWebClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
+  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* ChromeWebClient::GetDataResourceBytes(
     int resource_id) const {
-  return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      resource_id);
 }
 
 void ChromeWebClient::GetAdditionalWebUISchemes(

ios/chrome/browser/web/error_page_generator.mm

@@ -54,10 +54,10 @@
         &errorStrings);
 
     ui::ScaleFactor scaleFactor =
-        ResourceBundle::GetSharedInstance().GetMaxScaleFactor();
+        ui::ResourceBundle::GetSharedInstance().GetMaxScaleFactor();
 
     const base::StringPiece templateHTML(
-        ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
+        ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
             IDR_NET_ERROR_HTML, scaleFactor));
     if (templateHTML.empty())
       NOTREACHED() << "unable to load template. ID: " << IDR_NET_ERROR_HTML;

ios/showcase/core/app_delegate.mm

@@ -33,8 +33,8 @@
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
   base::CommandLine::Init(0, nullptr);
-  ResourceBundle::InitSharedInstanceWithLocale(
-      std::string(), nullptr, ResourceBundle::LOAD_COMMON_RESOURCES);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      std::string(), nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
   CHECK(base::i18n::InitializeICU());
 
   self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];

ios/web/public/test/fakes/test_web_client.mm

@@ -34,9 +34,10 @@ bool TestWebClient::IsAppSpecificURL(const GURL& url) const {
 
 base::RefCountedMemory* TestWebClient::GetDataResourceBytes(
     int resource_id) const {
-  if (!ResourceBundle::HasSharedInstance())
+  if (!ui::ResourceBundle::HasSharedInstance())
     return nullptr;
-  return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      resource_id);
 }
 
 NSString* TestWebClient::GetEarlyPageScript(BrowserState* browser_state) const {

ios/web/shell/shell_web_client.mm

@@ -78,13 +78,14 @@ std::string ShellWebClient::GetUserAgent(UserAgentType type) const {
 base::StringPiece ShellWebClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
+  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* ShellWebClient::GetDataResourceBytes(
     int resource_id) const {
-  return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      resource_id);
 }
 
 void ShellWebClient::RegisterServices(StaticServiceMap* services) {

ios/web/test/web_test_suite.mm

@@ -42,12 +42,12 @@ void WebTestSuite::Initialize() {
   base::PathService::Get(base::DIR_MODULE, &resources_pack_path);
   resources_pack_path =
       resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
-  ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
       resources_pack_path, ui::SCALE_FACTOR_NONE);
 }
 
 void WebTestSuite::Shutdown() {
-  ResourceBundle::CleanupSharedInstance();
+  ui::ResourceBundle::CleanupSharedInstance();
   base::TestSuite::Shutdown();
 }
 

ios/web_view/internal/web_view_web_client.mm

@@ -38,13 +38,14 @@ std::string WebViewWebClient::GetUserAgent(web::UserAgentType type) const {
 base::StringPiece WebViewWebClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
+  return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* WebViewWebClient::GetDataResourceBytes(
     int resource_id) const {
-  return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
+  return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
+      resource_id);
 }
 
 NSString* WebViewWebClient::GetEarlyPageScript(

mash/catalog_viewer/catalog_viewer.cc

@@ -102,7 +102,7 @@ class CatalogViewerContents : public views::WidgetDelegateView,
   gfx::ImageSkia GetWindowAppIcon() override {
     // TODO(jamescook): Create a new .pak file for this app and make a custom
     // icon, perhaps one that looks like the Chrome OS task viewer icon.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     return *rb.GetImageSkiaNamed(IDR_NOTIFICATION_SETTINGS);
   }
 
@@ -111,16 +111,16 @@ class CatalogViewerContents : public views::WidgetDelegateView,
     return static_cast<int>(entries_.size());
   }
   base::string16 GetText(int row, int column_id) override {
-    switch(column_id) {
-    case 0:
-      DCHECK(row < static_cast<int>(entries_.size()));
-      return base::UTF8ToUTF16(entries_[row].name);
-    case 1:
-      DCHECK(row < static_cast<int>(entries_.size()));
-      return base::UTF8ToUTF16(entries_[row].url);
-    default:
-      NOTREACHED();
-      break;
+    switch (column_id) {
+      case 0:
+        DCHECK(row < static_cast<int>(entries_.size()));
+        return base::UTF8ToUTF16(entries_[row].name);
+      case 1:
+        DCHECK(row < static_cast<int>(entries_.size()));
+        return base::UTF8ToUTF16(entries_[row].url);
+      default:
+        NOTREACHED();
+        break;
     }
     return base::string16();
   }

mash/task_viewer/task_viewer.cc

@@ -99,7 +99,7 @@ class TaskViewerContents
   gfx::ImageSkia GetWindowAppIcon() override {
     // TODO(jamescook): Create a new .pak file for this app and make a custom
     // icon, perhaps one that looks like the Chrome OS task viewer icon.
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     return *rb.GetImageSkiaNamed(IDR_NOTIFICATION_SETTINGS);
   }
 
@@ -122,19 +122,19 @@ class TaskViewerContents
     return static_cast<int>(instances_.size());
   }
   base::string16 GetText(int row, int column_id) override {
-    switch(column_id) {
-    case 0:
-      DCHECK(row < static_cast<int>(instances_.size()));
-      return base::UTF8ToUTF16(instances_[row]->display_name);
-    case 1:
-      DCHECK(row < static_cast<int>(instances_.size()));
-      return base::UTF8ToUTF16(instances_[row]->identity.name());
-    case 2:
-      DCHECK(row < static_cast<int>(instances_.size()));
-      return base::IntToString16(instances_[row]->pid);
-    default:
-      NOTREACHED();
-      break;
+    switch (column_id) {
+      case 0:
+        DCHECK(row < static_cast<int>(instances_.size()));
+        return base::UTF8ToUTF16(instances_[row]->display_name);
+      case 1:
+        DCHECK(row < static_cast<int>(instances_.size()));
+        return base::UTF8ToUTF16(instances_[row]->identity.name());
+      case 2:
+        DCHECK(row < static_cast<int>(instances_.size()));
+        return base::IntToString16(instances_[row]->pid);
+      default:
+        NOTREACHED();
+        break;
     }
     return base::string16();
   }
@@ -340,4 +340,4 @@ void TaskViewer::Create(::mash::mojom::LaunchableRequest request) {
 }
 
 }  // namespace task_viewer
-}  // namespace main
+}  // namespace mash