Revert 50257 - 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

TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2811016

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

2 files changed, 4 insertions, 4 deletions

diff --git a/base/data_pack.cc b/base/data_pack.cc
index 06f2308..4e5a569 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) const {
+bool DataPack::GetStringPiece(uint32 resource_id, StringPiece* data) {
   // 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) const {
   return true;
 }
 
-RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) const {
+RefCountedStaticMemory* DataPack::GetStaticMemory(uint32 resource_id) {
   base::StringPiece piece;
   if (!GetStringPiece(resource_id, &piece))
     return NULL;
diff --git a/base/data_pack.h b/base/data_pack.h
index f3f8481..8938491 100644
--- a/base/data_pack.h
+++ b/base/data_pack.h
@@ -35,12 +35,12 @@ class DataPack {
   // Get resource by id |resource_id|, filling in |data|.
   // The data is owned by the DataPack object and should not be modified.
   // Returns false if the resource id isn't found.
-  bool GetStringPiece(uint32 resource_id, StringPiece* data) const;
+  bool GetStringPiece(uint32 resource_id, StringPiece* data);
 
   // Like GetStringPiece(), but returns a reference to memory. This interface
   // is used for image data, while the StringPiece interface is usually used
   // for localization strings.
-  RefCountedStaticMemory* GetStaticMemory(uint32 resource_id) const;
+  RefCountedStaticMemory* GetStaticMemory(uint32 resource_id);
 
   // Writes a pack file containing |resources| to |path|.
   static bool WritePack(const FilePath& path,