Move data pack from base to app (it's just part of the resource bundle system...

webkit/tools/test_shell/test_shell_mac.mm

Index: webkit/tools/test_shell/test_shell_mac.mm
===================================================================
--- webkit/tools/test_shell/test_shell_mac.mm	(revision 69975)
+++ webkit/tools/test_shell/test_shell_mac.mm	(working copy)
@@ -9,9 +9,9 @@
 
 #include "webkit/tools/test_shell/test_shell.h"
 
+#include "app/data_pack.h"
 #include "base/base_paths.h"
 #include "base/basictypes.h"
-#include "base/data_pack.h"
 #include "base/debug_on_start.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
@@ -70,7 +70,7 @@
 const int kTestWindowYLocation = -14000;
 
 // Data pack resource. This is a pointer to the mmapped resources file.
-static base::DataPack* g_resource_data_pack = NULL;
+static app::DataPack* g_resource_data_pack = NULL;
 
 // Define static member variables
 base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
@@ -210,7 +210,7 @@
   // mmap the data pack which holds strings used by WebCore. This is only
   // a fatal error if we're bundled, which means we might be running layout
   // tests. This is a harmless failure for test_shell_tests.
-  g_resource_data_pack = new base::DataPack;
+  g_resource_data_pack = new app::DataPack;
   NSString *resource_path =
       [mac_util::MainAppBundle() pathForResource:@"test_shell"
                                           ofType:@"pak"];