Move ResourceBundle, DataPack to ui/base

ui/base/resource/resource_bundle.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "ui/base/resource/resource_bundle.h"
 
-#include "app/data_pack.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "build/build_config.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/resource/data_pack.h"
+
+namespace ui {
 
 namespace {
 
 // Font sizes relative to base font.
 #if defined(OS_CHROMEOS) && defined(CROS_FONTS_USING_BCI)
 const int kSmallFontSizeDelta = -3;
 const int kMediumFontSizeDelta = 2;
 const int kLargeFontSizeDelta = 7;
 #else
 const int kSmallFontSizeDelta = -2;
@@ skipping 214 matching lines @@
     : path_(path) {
   // Always preload the data packs so we can maintain constness.
   Load();
 }
 
 ResourceBundle::LoadedDataPack::~LoadedDataPack() {
 }
 
 void ResourceBundle::LoadedDataPack::Load() {
   DCHECK(!data_pack_.get());
-  data_pack_.reset(new app::DataPack);
+  data_pack_.reset(new ui::DataPack);
   bool success = data_pack_->Load(path_);
   LOG_IF(ERROR, !success) << "Failed to load " << path_.value()
       << "\nYou will not be able to use the Bookmarks Manager or "
       << "about:net-internals.";
 }
 
 bool ResourceBundle::LoadedDataPack::GetStringPiece(
     int resource_id, base::StringPiece* data) const {
   return data_pack_->GetStringPiece(static_cast<uint32>(resource_id), data);
 }
 
 RefCountedStaticMemory* ResourceBundle::LoadedDataPack::GetStaticMemory(
     int resource_id) const {
   return data_pack_->GetStaticMemory(resource_id);
 }
+
+}  // namespace ui