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

tony's CL 2814009 that tell make about the net_internals_resources_map.{cc,h}
files.

Load net-internals from the newly created resources.pak file.

This patch also forces the loading of the optional DataPack for const correctness reasons

Original Review: http://codereview.chromium.org/2855003

BUG=35793,42770
TEST=none
TBR=tony

Review URL: http://codereview.chromium.org/2800014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50257 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/base/data_pack.cc b/base/data_pack.cc
index 4e5a569..06f2308 100644
--- a/base/data_pack.cc
+++ b/base/data_pack.cc
@@ -96,7 +96,7 @@ bool DataPack::Load(const FilePath& path) {
   return true;
 }
 
-bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) {
+bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) const {
   // It won't be hard to make this endian-agnostic, but it's not worth
   // bothering to do right now.
 #if defined(__BYTE_ORDER)
@@ -119,7 +119,7 @@ bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) {
   return true;
 }
 
-RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) {
+RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) const {
   base::StringPiece piece;
   if (!GetStringPiece(resource_id, &piece))
     return NULL;