Move ResourceBundle, DataPack to ui/base

webkit/tools/test_shell/test_shell_gtk.cc

Index: webkit/tools/test_shell/test_shell_gtk.cc
===================================================================
--- webkit/tools/test_shell/test_shell_gtk.cc	(revision 72000)
+++ webkit/tools/test_shell/test_shell_gtk.cc	(working copy)
@@ -11,7 +11,6 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "app/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ -26,6 +25,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/resource/data_pack.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
@@ -45,7 +45,7 @@
 }
 
 // Data resources on linux.  This is a pointer to the mmapped resources file.
-app::DataPack* g_resource_data_pack = NULL;
+ui::DataPack* g_resource_data_pack = NULL;
 
 void TerminationSignalHandler(int signatl) {
   TestShell::ShutdownTestShell();
@@ -159,7 +159,7 @@
 
   web_prefs_ = new WebPreferences;
 
-  g_resource_data_pack = new app::DataPack;
+  g_resource_data_pack = new ui::DataPack;
   FilePath data_path;
   PathService::Get(base::DIR_EXE, &data_path);
   data_path = data_path.Append("test_shell.pak");