Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory.

content/public/common/content_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/content_client.h"
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "content/public/common/origin_util.h"
@@ skipping 74 matching lines @@
 base::string16 ContentClient::GetLocalizedString(int message_id) const {
   return base::string16();
 }
 
 base::StringPiece ContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
   return base::StringPiece();
 }
 
-base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes(
+base::RefCountedMemory* ContentClient::GetDataResourceBytes(
     int resource_id) const {
   return NULL;

[nasko, 2016/05/24 21:05:44]

nit: nullptr since you are touching this method.

[smaier, 2016/05/25 13:29:14]

Done.

 }
 
 gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
   CR_DEFINE_STATIC_LOCAL(gfx::Image, kEmptyImage, ());
   return kEmptyImage;
 }
 
 std::string ContentClient::GetProcessTypeNameInEnglish(int type) {
   NOTIMPLEMENTED();
   return std::string();
@@ skipping 19 matching lines @@
 bool ContentClient::UsingSynchronousCompositing() {
   return false;
 }
 
 media::MediaClientAndroid* ContentClient::GetMediaClientAndroid() {
   return nullptr;
 }
 #endif  // OS_ANDROID
 
 }  // namespace content