Revert of Eliminate silently letting errors pass on pak loading.

ui/base/resource/resource_bundle.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 "ui/base/resource/resource_bundle.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/big_endian.h"
@@ skipping 232 matching lines @@
 void ResourceBundle::AddDataPackFromFile(base::File file,
                                          ScaleFactor scale_factor) {
   AddDataPackFromFileRegion(
       file.Pass(), base::MemoryMappedFile::Region::kWholeFile, scale_factor);
 }
 
 void ResourceBundle::AddDataPackFromFileRegion(
     base::File file,
     const base::MemoryMappedFile::Region& region,
     ScaleFactor scale_factor) {
-  scoped_ptr<DataPack> data_pack(new DataPack(scale_factor));
+  scoped_ptr<DataPack> data_pack(
+      new DataPack(scale_factor));
   if (data_pack->LoadFromFileRegion(file.Pass(), region)) {
     AddDataPack(data_pack.release());
   } else {
     LOG(ERROR) << "Failed to load data pack from file."
                << "\nSome features may not be available.";
   }
 }
 
 #if !defined(OS_MACOSX)
 base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
@@ skipping 33 matching lines @@
   base::FilePath locale_file_path = GetOverriddenPakPath();
   if (locale_file_path.empty())
     locale_file_path = GetLocaleFilePath(app_locale, true);
 
   if (locale_file_path.empty()) {
     // It's possible that there is no locale.pak.
     LOG(WARNING) << "locale_file_path.empty()";
     return std::string();
   }
 
-  scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P));
+  scoped_ptr<DataPack> data_pack(
+      new DataPack(SCALE_FACTOR_100P));
   if (!data_pack->LoadFromPath(locale_file_path)) {
     UMA_HISTOGRAM_ENUMERATION("ResourceBundle.LoadLocaleResourcesError",
                               logging::GetLastSystemErrorCode(), 16000);
     LOG(ERROR) << "failed to load locale.pak";
     NOTREACHED();
     return std::string();
   }
 
   locale_resources_data_.reset(data_pack.release());
   return app_locale;
@@ skipping 338 matching lines @@
                                                  ScaleFactor scale_factor,
                                                  bool optional) {
   // Do not pass an empty |path| value to this method. If the absolute path is
   // unknown pass just the pack file name.
   DCHECK(!path.empty());
 
   base::FilePath pack_path = path;
   if (delegate_)
     pack_path = delegate_->GetPathForResourcePack(pack_path, scale_factor);
 
-  // An empty path is a request from the delegate to cancel loading.
-  if (pack_path.empty())
+  // Don't try to load empty values or values that are not absolute paths.
+  if (pack_path.empty() || !pack_path.IsAbsolute())
     return;
 
-  scoped_ptr<DataPack> data_pack(new DataPack(scale_factor));
+  scoped_ptr<DataPack> data_pack(
+      new DataPack(scale_factor));
   if (data_pack->LoadFromPath(pack_path)) {
     AddDataPack(data_pack.release());
   } else if (!optional) {
-    DLOG(FATAL) << "Failed to load " << pack_path.value();
+    LOG(ERROR) << "Failed to load " << pack_path.value()
+               << "\nSome features may not be available.";
   }
 }
 
 void ResourceBundle::AddDataPack(DataPack* data_pack) {
   data_packs_.push_back(data_pack);
 
   if (GetScaleForScaleFactor(data_pack->GetScaleFactor()) >
       GetScaleForScaleFactor(max_scale_factor_))
     max_scale_factor_ = data_pack->GetScaleFactor();
 }
@@ skipping 167 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui