Move ResourceBundle, DataPack to ui/base

chrome/tools/mac_helpers/infoplist_strings_util.mm

Index: chrome/tools/mac_helpers/infoplist_strings_util.mm
===================================================================
--- chrome/tools/mac_helpers/infoplist_strings_util.mm	(revision 72000)
+++ chrome/tools/mac_helpers/infoplist_strings_util.mm	(working copy)
@@ -11,13 +11,13 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "app/data_pack.h"
 #include "base/file_path.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "grit/chromium_strings.h"
+#include "ui/base/resource/data_pack.h"
 
 namespace {
 
@@ -51,16 +51,16 @@
   return nil;
 }
 
-app::DataPack* LoadResourceDataPack(const char* dir_path,
-                                    const char* branding_strings_name,
-                                    const char* locale_name) {
-  app::DataPack* resource_pack = NULL;
+ui::DataPack* LoadResourceDataPack(const char* dir_path,
+                                   const char* branding_strings_name,
+                                   const char* locale_name) {
+  ui::DataPack* resource_pack = NULL;
 
   NSString* resource_path = [NSString stringWithFormat:@"%s/%s_%s.pak",
                              dir_path, branding_strings_name, locale_name];
   if (resource_path) {
     FilePath resources_pak_path([resource_path fileSystemRepresentation]);
-    resource_pack = new app::DataPack;
+    resource_pack = new ui::DataPack;
     bool success = resource_pack->Load(resources_pak_path);
     if (!success) {
       delete resource_pack;
@@ -71,7 +71,7 @@
   return resource_pack;
 }
 
-NSString* LoadStringFromDataPack(app::DataPack* data_pack,
+NSString* LoadStringFromDataPack(ui::DataPack* data_pack,
                                  const char* data_pack_lang,
                                  uint32_t resource_id,
                                  const char* resource_id_str) {
@@ -204,7 +204,7 @@
     const char* cur_lang = lang_list[loop];
 
     // Open the branded string pak file
-    scoped_ptr<app::DataPack> branded_data_pack(
+    scoped_ptr<ui::DataPack> branded_data_pack(
         LoadResourceDataPack(grit_output_dir,
                              branding_strings_name,
                              cur_lang));