Remove const interfaces from content/public/common.

Bug: 908139
Tbr: boliu@chromium.org, lazyboy@chromium.org, scottmg@chromium.org, johannes@chromium.org, seantopping@chromium.org
Change-Id: I56fafc55cdb6e77f479c6d657be8dd20162cd2b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1667790
Commit-Queue: Lucas Gadani <lfg@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672186}

android_webview/common/aw_content_client.cc

@@ -31,7 +31,7 @@ void AwContentClient::AddAdditionalSchemes(Schemes* schemes) {
   schemes->allow_non_standard_schemes_in_origins = true;
 }
 
-base::string16 AwContentClient::GetLocalizedString(int message_id) const {
+base::string16 AwContentClient::GetLocalizedString(int message_id) {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return l10n_util::GetStringUTF16(message_id);
@@ -39,20 +39,19 @@ base::string16 AwContentClient::GetLocalizedString(int message_id) const {
 
 base::StringPiece AwContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
-base::RefCountedMemory* AwContentClient::GetDataResourceBytes(
-    int resource_id) const {
+base::RefCountedMemory* AwContentClient::GetDataResourceBytes(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-bool AwContentClient::IsDataResourceGzipped(int resource_id) const {
+bool AwContentClient::IsDataResourceGzipped(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 

android_webview/common/aw_content_client.h

@@ -19,12 +19,11 @@ class AwContentClient : public content::ContentClient {
  public:
   // ContentClient implementation.
   void AddAdditionalSchemes(Schemes* schemes) override;
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
-  bool IsDataResourceGzipped(int resource_id) const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  bool IsDataResourceGzipped(int resource_id) override;
   bool CanSendWhileSwappedOut(const IPC::Message* message) override;
   void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
   bool UsingSynchronousCompositing() override;

chrome/common/chrome_content_client.cc

@@ -654,39 +654,39 @@ void ChromeContentClient::AddAdditionalSchemes(Schemes* schemes) {
 #endif
 }
 
-base::string16 ChromeContentClient::GetLocalizedString(int message_id) const {
+base::string16 ChromeContentClient::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::string16 ChromeContentClient::GetLocalizedString(
     int message_id,
-    const base::string16& replacement) const {
+    const base::string16& replacement) {
   return l10n_util::GetStringFUTF16(message_id, replacement);
 }
 
 base::StringPiece ChromeContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* ChromeContentClient::GetDataResourceBytes(
-    int resource_id) const {
+    int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-bool ChromeContentClient::IsDataResourceGzipped(int resource_id) const {
+bool ChromeContentClient::IsDataResourceGzipped(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 
-gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& ChromeContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }
 
-base::DictionaryValue ChromeContentClient::GetNetLogConstants() const {
+base::DictionaryValue ChromeContentClient::GetNetLogConstants() {
   auto platform_dict = net_log::GetPlatformConstantsForNetLog(
       base::CommandLine::ForCurrentProcess()->GetCommandLineString(),
       chrome::GetChannelName());

chrome/common/chrome_content_client.h

@@ -83,18 +83,15 @@ class ChromeContentClient : public content::ContentClient {
       std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
 
   void AddAdditionalSchemes(Schemes* schemes) override;
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::string16 GetLocalizedString(
-      int message_id,
-      const base::string16& replacement) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const override;
-  bool IsDataResourceGzipped(int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
-  base::DictionaryValue GetNetLogConstants() const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::string16 GetLocalizedString(int message_id,
+                                    const base::string16& replacement) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  bool IsDataResourceGzipped(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
+  base::DictionaryValue GetNetLogConstants() override;
   std::string GetProcessTypeNameInEnglish(int type) override;
 
   bool AllowScriptExtensionForServiceWorker(

chromecast/common/cast_content_client.cc

@@ -113,22 +113,22 @@ void CastContentClient::AddAdditionalSchemes(Schemes* schemes) {
 #endif
 }
 
-base::string16 CastContentClient::GetLocalizedString(int message_id) const {
+base::string16 CastContentClient::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece CastContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
-bool CastContentClient::IsDataResourceGzipped(int resource_id) const {
+bool CastContentClient::IsDataResourceGzipped(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 
-gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }

chromecast/common/cast_content_client.h

@@ -21,12 +21,11 @@ class CastContentClient : public content::ContentClient {
   // content::ContentClient implementation:
   void SetActiveURL(const GURL& url, std::string top_origin) override;
   void AddAdditionalSchemes(Schemes* schemes) override;
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  bool IsDataResourceGzipped(int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  bool IsDataResourceGzipped(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
 #if defined(OS_ANDROID)
   ::media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override;
 #endif  // OS_ANDROID

chromecast/common/cast_url_loader_throttle.cc

@@ -38,7 +38,7 @@ void CastURLLoaderThrottle::WillStartRequest(
   }
 }
 
-bool CastURLLoaderThrottle::makes_unsafe_redirect() const {
+bool CastURLLoaderThrottle::makes_unsafe_redirect() {
   // Yes, this makes cross-scheme redirects.
   return true;
 }

chromecast/common/cast_url_loader_throttle.h

@@ -39,7 +39,7 @@ class CastURLLoaderThrottle : public content::URLLoaderThrottle {
   void DetachFromCurrentSequence() override;
   void WillStartRequest(network::ResourceRequest* request,
                         bool* defer) override;
-  bool makes_unsafe_redirect() const override;
+  bool makes_unsafe_redirect() override;
 
   void ResumeRequest(int error, net::HttpRequestHeaders headers);
 

content/browser/accessibility/browser_accessibility.cc

@@ -1596,7 +1596,7 @@ bool BrowserAccessibility::AccessibilityPerformAction(
 
 base::string16 BrowserAccessibility::GetLocalizedStringForImageAnnotationStatus(
     ax::mojom::ImageAnnotationStatus status) const {
-  const ContentClient* content_client = content::GetContentClient();
+  ContentClient* content_client = content::GetContentClient();
 
   int message_id = 0;
   switch (status) {
@@ -1628,13 +1628,13 @@ base::string16 BrowserAccessibility::GetLocalizedStringForImageAnnotationStatus(
 
 base::string16
 BrowserAccessibility::GetLocalizedRoleDescriptionForUnlabeledImage() const {
-  const ContentClient* content_client = content::GetContentClient();
+  ContentClient* content_client = content::GetContentClient();
   return content_client->GetLocalizedString(
       IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION);
 }
 
 base::string16 BrowserAccessibility::GetLocalizedStringForLandmarkType() const {
-  const ContentClient* content_client = content::GetContentClient();
+  ContentClient* content_client = content::GetContentClient();
   const ui::AXNodeData& data = GetData();
 
   switch (data.role) {
@@ -1663,7 +1663,7 @@ base::string16 BrowserAccessibility::GetStyleNameAttributeAsLocalizedString()
   const BrowserAccessibility* current_node = this;
   while (current_node) {
     if (current_node->GetData().role == ax::mojom::Role::kMark) {
-      const ContentClient* content_client = content::GetContentClient();
+      ContentClient* content_client = content::GetContentClient();
       return content_client->GetLocalizedString(IDS_AX_ROLE_MARK);
     }
     current_node = current_node->PlatformGetParent();

content/browser/media/session/media_session_impl.cc

@@ -1198,7 +1198,7 @@ void MediaSessionImpl::RebuildAndNotifyMetadataChanged() {
   if (metadata.title.empty())
     metadata.title = SanitizeMediaTitle(web_contents()->GetTitle());
 
-  const ContentClient* content_client = content::GetContentClient();
+  ContentClient* content_client = content::GetContentClient();
   const GURL& url = web_contents()->GetLastCommittedURL();
 
   // If the url is a file then we should display a placeholder.

content/browser/webui/web_ui_data_source_unittest.cc

@@ -27,14 +27,13 @@ class TestClient : public TestContentClient {
   TestClient() : is_gzipped_(false) {}
   ~TestClient() override {}
 
-  base::string16 GetLocalizedString(int message_id) const override {
+  base::string16 GetLocalizedString(int message_id) override {
     if (message_id == kDummyStringId)
       return base::UTF8ToUTF16(kDummyString);
     return base::string16();
   }
 
-  base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const override {
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override {
     base::RefCountedStaticMemory* bytes = nullptr;
     if (resource_id == kDummyDefaultResourceId) {
       bytes = new base::RefCountedStaticMemory(
@@ -46,9 +45,7 @@ class TestClient : public TestContentClient {
     return bytes;
   }
 
-  bool IsDataResourceGzipped(int resource_id) const override {
-    return is_gzipped_;
-  }
+  bool IsDataResourceGzipped(int resource_id) override { return is_gzipped_; }
 
   // Sets the response for |IsDataResourceGzipped()|.
   void SetIsDataResourceGzipped(bool is_gzipped) { is_gzipped_ = is_gzipped; }

content/public/common/content_client.cc

@@ -71,32 +71,30 @@ bool ContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {
   return false;
 }
 
-base::string16 ContentClient::GetLocalizedString(int message_id) const {
+base::string16 ContentClient::GetLocalizedString(int message_id) {
   return base::string16();
 }
 
 base::string16 ContentClient::GetLocalizedString(
     int message_id,
-    const base::string16& replacement) const {
+    const base::string16& replacement) {
   return base::string16();
 }
 
-base::StringPiece ContentClient::GetDataResource(
-    int resource_id,
-    ui::ScaleFactor scale_factor) const {
+base::StringPiece ContentClient::GetDataResource(int resource_id,
+                                                 ui::ScaleFactor scale_factor) {
   return base::StringPiece();
 }
 
-base::RefCountedMemory* ContentClient::GetDataResourceBytes(
-    int resource_id) const {
+base::RefCountedMemory* ContentClient::GetDataResourceBytes(int resource_id) {
   return nullptr;
 }
 
-bool ContentClient::IsDataResourceGzipped(int resource_id) const {
+bool ContentClient::IsDataResourceGzipped(int resource_id) {
   return false;
 }
 
-gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) {
   static base::NoDestructor<gfx::Image> kEmptyImage;
   return *kEmptyImage;
 }
@@ -106,7 +104,7 @@ std::string ContentClient::GetProcessTypeNameInEnglish(int type) {
   return std::string();
 }
 
-base::DictionaryValue ContentClient::GetNetLogConstants() const {
+base::DictionaryValue ContentClient::GetNetLogConstants() {
   return base::DictionaryValue();
 }
 

content/public/common/content_client.h

@@ -151,28 +151,25 @@ class CONTENT_EXPORT ContentClient {
   virtual bool CanSendWhileSwappedOut(const IPC::Message* message);
 
   // Returns a string resource given its id.
-  virtual base::string16 GetLocalizedString(int message_id) const;
+  virtual base::string16 GetLocalizedString(int message_id);
 
   // Returns a string resource given its id and replace $1 with the given
   // replacement.
-  virtual base::string16 GetLocalizedString(
-      int message_id,
-      const base::string16& replacement) const;
+  virtual base::string16 GetLocalizedString(int message_id,
+                                            const base::string16& replacement);
 
   // Return the contents of a resource in a StringPiece given the resource id.
-  virtual base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const;
+  virtual base::StringPiece GetDataResource(int resource_id,
+                                            ui::ScaleFactor scale_factor);
 
   // Returns the raw bytes of a scale independent data resource.
-  virtual base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const;
+  virtual base::RefCountedMemory* GetDataResourceBytes(int resource_id);
 
   // Returns whether the contents of a resource are compressed (with gzip).
-  virtual bool IsDataResourceGzipped(int resource_id) const;
+  virtual bool IsDataResourceGzipped(int resource_id);
 
   // Returns a native image given its id.
-  virtual gfx::Image& GetNativeImageNamed(int resource_id) const;
+  virtual gfx::Image& GetNativeImageNamed(int resource_id);
 
   // Called by content::GetProcessTypeNameInEnglish for process types that it
   // doesn't know about because they're from the embedder.
@@ -184,7 +181,7 @@ class CONTENT_EXPORT ContentClient {
   // |GetNetConstants()| and passed to FileNetLogObserver - see documentation
   // of |FileNetLogObserver::CreateBounded()| for more information.  The
   // convention is to put new constants under a subdict at the key "clientInfo".
-  virtual base::DictionaryValue GetNetLogConstants() const;
+  virtual base::DictionaryValue GetNetLogConstants();
 
   // Returns whether or not V8 script extensions should be allowed for a
   // service worker.

content/public/common/url_loader_throttle.cc

@@ -60,7 +60,7 @@ void URLLoaderThrottle::WillOnCompleteWithError(
     const network::URLLoaderCompletionStatus& status,
     bool* defer) {}
 
-bool URLLoaderThrottle::makes_unsafe_redirect() const {
+bool URLLoaderThrottle::makes_unsafe_redirect() {
   return false;
 }
 

content/public/common/url_loader_throttle.h

@@ -169,7 +169,7 @@ class CONTENT_EXPORT URLLoaderThrottle {
   // Must return true if the throttle may make cross-scheme redirects
   // (which is usually considered unsafe, so allowed only if the setting
   // is made very explicitly).
-  virtual bool makes_unsafe_redirect() const;
+  virtual bool makes_unsafe_redirect();
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 

content/shell/common/shell_content_client.cc

@@ -24,7 +24,7 @@ ShellContentClient::ShellContentClient() {}
 
 ShellContentClient::~ShellContentClient() {}
 
-base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
+base::string16 ShellContentClient::GetLocalizedString(int message_id) {
   if (switches::IsRunWebTestsSwitchPresent()) {
     switch (message_id) {
       case IDS_FORM_OTHER_DATE_LABEL:
@@ -48,7 +48,7 @@ base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
 
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   if (switches::IsRunWebTestsSwitchPresent()) {
     switch (resource_id) {
       case IDR_BROKENIMAGE:
@@ -65,21 +65,21 @@ base::StringPiece ShellContentClient::GetDataResource(
 }
 
 base::RefCountedMemory* ShellContentClient::GetDataResourceBytes(
-    int resource_id) const {
+    int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-bool ShellContentClient::IsDataResourceGzipped(int resource_id) const {
+bool ShellContentClient::IsDataResourceGzipped(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 
-gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }
 
-base::DictionaryValue ShellContentClient::GetNetLogConstants() const {
+base::DictionaryValue ShellContentClient::GetNetLogConstants() {
   base::DictionaryValue client_constants;
   client_constants.SetString("name", "content_shell");
   client_constants.SetString(

content/shell/common/shell_content_client.h

@@ -19,15 +19,13 @@ class ShellContentClient : public ContentClient {
   ShellContentClient();
   ~ShellContentClient() override;
 
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const override;
-  bool IsDataResourceGzipped(int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
-  base::DictionaryValue GetNetLogConstants() const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  bool IsDataResourceGzipped(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
+  base::DictionaryValue GetNetLogConstants() override;
   blink::OriginTrialPolicy* GetOriginTrialPolicy() override;
 
  private:

content/test/test_content_client.cc

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

content/test/test_content_client.h

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

extensions/shell/common/shell_content_client.cc

@@ -82,24 +82,24 @@ void ShellContentClient::AddAdditionalSchemes(Schemes* schemes) {
   schemes->csp_bypassing_schemes.push_back(kExtensionScheme);
 }
 
-base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
+base::string16 ShellContentClient::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* ShellContentClient::GetDataResourceBytes(
-    int resource_id) const {
+    int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }

extensions/shell/common/shell_content_client.h

@@ -20,13 +20,11 @@ class ShellContentClient : public content::ContentClient {
   void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) override;
   void AddAdditionalSchemes(Schemes* schemes) override;
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellContentClient);

fuchsia/engine/web_engine_content_client.cc

@@ -9,25 +9,24 @@
 WebEngineContentClient::WebEngineContentClient() = default;
 WebEngineContentClient::~WebEngineContentClient() = default;
 
-base::string16 WebEngineContentClient::GetLocalizedString(
-    int message_id) const {
+base::string16 WebEngineContentClient::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece WebEngineContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* WebEngineContentClient::GetDataResourceBytes(
-    int resource_id) const {
+    int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-gfx::Image& WebEngineContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& WebEngineContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }

fuchsia/engine/web_engine_content_client.h

@@ -14,12 +14,11 @@ class WebEngineContentClient : public content::ContentClient {
   ~WebEngineContentClient() override;
 
   // content::ContentClient implementation.
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
   blink::OriginTrialPolicy* GetOriginTrialPolicy() override;
 
  private:

headless/lib/headless_content_client.cc

@@ -13,24 +13,24 @@ HeadlessContentClient::HeadlessContentClient() = default;
 
 HeadlessContentClient::~HeadlessContentClient() = default;
 
-base::string16 HeadlessContentClient::GetLocalizedString(int message_id) const {
+base::string16 HeadlessContentClient::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 base::StringPiece HeadlessContentClient::GetDataResource(
     int resource_id,
-    ui::ScaleFactor scale_factor) const {
+    ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
       resource_id, scale_factor);
 }
 
 base::RefCountedMemory* HeadlessContentClient::GetDataResourceBytes(
-    int resource_id) const {
+    int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
       resource_id);
 }
 
-gfx::Image& HeadlessContentClient::GetNativeImageNamed(int resource_id) const {
+gfx::Image& HeadlessContentClient::GetNativeImageNamed(int resource_id) {
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       resource_id);
 }

headless/lib/headless_content_client.h

@@ -16,13 +16,11 @@ class HeadlessContentClient : public content::ContentClient {
   ~HeadlessContentClient() override;
 
   // content::ContentClient implementation:
-  base::string16 GetLocalizedString(int message_id) const override;
-  base::StringPiece GetDataResource(
-      int resource_id,
-      ui::ScaleFactor scale_factor) const override;
-  base::RefCountedMemory* GetDataResourceBytes(
-      int resource_id) const override;
-  gfx::Image& GetNativeImageNamed(int resource_id) const override;
+  base::string16 GetLocalizedString(int message_id) override;
+  base::StringPiece GetDataResource(int resource_id,
+                                    ui::ScaleFactor scale_factor) override;
+  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
+  gfx::Image& GetNativeImageNamed(int resource_id) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HeadlessContentClient);