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

app/resource_bundle.cc

 // 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.
 
 #include "app/resource_bundle.h"
 
 #include "base/data_pack.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "build/build_config.h"
@@ skipping 87 matching lines @@
   if (!gfx::PNGCodec::Decode(memory->front(), memory->size(), &bitmap)) {
     NOTREACHED() << "Unable to decode theme image resource " << resource_id;
     return NULL;
   }
 
   return new SkBitmap(bitmap);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
     int resource_id) const {
-  RefCountedStaticMemory* bytes =
-      LoadResourceBytes(resources_data_, resource_id);
-
-  // Check all our additional data packs for the resources if it wasn't loaded
-  // from our main source.
-  for (std::vector<LoadedDataPack*>::const_iterator it = data_packs_.begin();
-       !bytes && it != data_packs_.end(); ++it) {
-    bytes = (*it)->GetStaticMemory(resource_id);
-  }
-
-  return bytes;
+  return LoadResourceBytes(resources_data_, resource_id);
 }
 
 SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
   // Check to see if we already have the Skia image in the cache.
   {
     AutoLock lock_scope(lock_);
     SkImageMap::const_iterator found = skia_images_.find(resource_id);
     if (found != skia_images_.end())
       return found->second;
   }
@@ skipping 72 matching lines @@
     case LargeFont:
       return *large_font_;
     default:
       return *base_font_;
   }
 }
 
 // LoadedDataPack implementation
 ResourceBundle::LoadedDataPack::LoadedDataPack(const FilePath& path)
     : path_(path) {
-  // Always preload the data packs so we can maintain constness.
+  // On unicies, we preload data packs so background updates don't cause us to
+  // load the wrong data.
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   Load();
+#endif
 }
 
 void ResourceBundle::LoadedDataPack::Load() {
   DCHECK(!data_pack_.get());
   data_pack_.reset(new base::DataPack);
   bool success = data_pack_->Load(path_);
   CHECK(success) << "Failed to load " << path_.value();
 }
 
-bool ResourceBundle::LoadedDataPack::GetStringPiece(
-    int resource_id, base::StringPiece* data) const {
+bool ResourceBundle::LoadedDataPack::GetStringPiece(int resource_id,
+                                                    base::StringPiece* data) {
+  if (!data_pack_.get())
+    Load();
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
-
-RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
-    int resource_id) const {
-  return data_pack_->GetStaticMemory(resource_id);
-}