Reland r50057. This is exactly the same except with two lines cherrypicked from

app/resource_bundle.h

 // Copyright (c) 2010 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.
 
 #ifndef APP_RESOURCE_BUNDLE_H_
 #define APP_RESOURCE_BUNDLE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 141 matching lines @@
   static const SkColor frame_color_app_panel_inactive;
   static const SkColor frame_color_incognito;
   static const SkColor frame_color_incognito_inactive;
   static const SkColor toolbar_color;
   static const SkColor toolbar_separator_color;
 
  private:
   // Helper class for managing data packs.
   class LoadedDataPack {
    public:
-    LoadedDataPack(const FilePath& path);
-    bool GetStringPiece(int resource_id, base::StringPiece* data);
+    explicit LoadedDataPack(const FilePath& path);
+    bool GetStringPiece(int resource_id, base::StringPiece* data) const;
+    RefCountedStaticMemory* GetStaticMemory(int resource_id) const;
 
    private:
     void Load();
 
     scoped_ptr<base::DataPack> data_pack_;
     FilePath path_;
 
     DISALLOW_COPY_AND_ASSIGN(LoadedDataPack);
   };
 
@@ skipping 83 matching lines @@
   scoped_ptr<gfx::Font> medium_bold_font_;
   scoped_ptr<gfx::Font> large_font_;
   scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 #endif  // APP_RESOURCE_BUNDLE_H_