Rename ScaleFactor to ResourceScaleFactor in content/headless

Bug: 1217405
Change-Id: Ida4c14569fe49d77793b5ad7ca9edf3270d82d51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3003118
Auto-Submit: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#904617}

content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm

@@ -142,9 +142,10 @@ TEST_F(RenderWidgetHostViewMacEditCommandHelperWithTaskEnvTest,
   auto agent_scheduling_group_host =
       std::make_unique<AgentSchedulingGroupHost>(*process_host);
   // Populates |g_supported_scale_factors|.
-  std::vector<ui::ScaleFactor> supported_factors;
+  std::vector<ui::ResourceScaleFactor> supported_factors;
   supported_factors.push_back(ui::SCALE_FACTOR_100P);
-  ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
+  ui::test::ScopedSetSupportedResourceScaleFactors scoped_supported(
+      supported_factors);
 
   @autoreleasepool {
     int32_t routing_id = process_host->GetNextRoutingID();

content/public/common/content_client.cc

@@ -79,8 +79,9 @@ std::u16string ContentClient::GetLocalizedString(
   return std::u16string();
 }
 
-base::StringPiece ContentClient::GetDataResource(int resource_id,
+base::StringPiece ContentClient::GetDataResource(
-                                                 ui::ScaleFactor scale_factor) {
+    int resource_id,
+    ui::ResourceScaleFactor scale_factor) {
   return base::StringPiece();
 }
 

content/public/common/content_client.h

@@ -157,8 +157,9 @@ class CONTENT_EXPORT ContentClient {
                                             const std::u16string& replacement);
 
   // Return the contents of a resource in a StringPiece given the resource id.
-  virtual base::StringPiece GetDataResource(int resource_id,
+  virtual base::StringPiece GetDataResource(
-                                            ui::ScaleFactor scale_factor);
+      int resource_id,
+      ui::ResourceScaleFactor scale_factor);
 
   // Returns the raw bytes of a scale independent data resource.
   virtual base::RefCountedMemory* GetDataResourceBytes(int resource_id);

content/shell/common/shell_content_client.cc

@@ -47,7 +47,7 @@ std::u16string ShellContentClient::GetLocalizedString(int message_id) {
 
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) {
+    ui::ResourceScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }

content/shell/common/shell_content_client.h

@@ -20,8 +20,9 @@ class ShellContentClient : public ContentClient {
   ~ShellContentClient() override;
 
   std::u16string GetLocalizedString(int message_id) override;
-  base::StringPiece GetDataResource(int resource_id,
+  base::StringPiece GetDataResource(
-                                    ui::ScaleFactor scale_factor) override;
+      int resource_id,
+      ui::ResourceScaleFactor scale_factor) override;
   base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
   gfx::Image& GetNativeImageNamed(int resource_id) override;
   blink::OriginTrialPolicy* GetOriginTrialPolicy() override;

content/test/test_content_client.cc

@@ -59,7 +59,7 @@ TestContentClient::~TestContentClient() {
 
 base::StringPiece TestContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) {
+    ui::ResourceScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }

content/test/test_content_client.h

@@ -17,8 +17,9 @@ class TestContentClient : public ContentClient {
   ~TestContentClient() override;
 
   // ContentClient:
-  base::StringPiece GetDataResource(int resource_id,
+  base::StringPiece GetDataResource(
-                                    ui::ScaleFactor scale_factor) override;
+      int resource_id,
+      ui::ResourceScaleFactor scale_factor) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestContentClient);

content/test/test_render_view_host.cc

@@ -373,10 +373,11 @@ void TestRenderViewHost::TestOnUpdateStateWithFile(
 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness()
     : RenderViewHostTestHarness(
           base::test::TaskEnvironment::TimeSource::MOCK_TIME) {
-  std::vector<ui::ScaleFactor> scale_factors;
+  std::vector<ui::ResourceScaleFactor> scale_factors;
   scale_factors.push_back(ui::SCALE_FACTOR_100P);
   scoped_set_supported_scale_factors_ =
-      std::make_unique<ui::test::ScopedSetSupportedScaleFactors>(scale_factors);
+      std::make_unique<ui::test::ScopedSetSupportedResourceScaleFactors>(
+          scale_factors);
 }
 
 RenderViewHostImplTestHarness::~RenderViewHostImplTestHarness() {

content/test/test_render_view_host.h

@@ -288,7 +288,7 @@ class RenderViewHostImplTestHarness : public RenderViewHostTestHarness {
   TestRenderFrameHost* main_test_rfh();
 
  private:
-  typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
+  typedef std::unique_ptr<ui::test::ScopedSetSupportedResourceScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);

headless/lib/headless_content_client.cc

@@ -20,7 +20,7 @@ std::u16string HeadlessContentClient::GetLocalizedString(int message_id) {
 
 base::StringPiece HeadlessContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) {
+    ui::ResourceScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }

headless/lib/headless_content_client.h

@@ -23,8 +23,9 @@ class HeadlessContentClient : public content::ContentClient {
 
   // content::ContentClient implementation:
   std::u16string GetLocalizedString(int message_id) override;
-  base::StringPiece GetDataResource(int resource_id,
+  base::StringPiece GetDataResource(
-                                    ui::ScaleFactor scale_factor) override;
+      int resource_id,
+      ui::ResourceScaleFactor scale_factor) override;
   base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
   gfx::Image& GetNativeImageNamed(int resource_id) override;
   blink::OriginTrialPolicy* GetOriginTrialPolicy() override;