Move ResourceBundle, DataPack to ui/base

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6263008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 14 deletions

diff --git a/webkit/plugins/ppapi/DEPS b/webkit/plugins/ppapi/DEPS
index 884f203..5c56369 100644
--- a/webkit/plugins/ppapi/DEPS
+++ b/webkit/plugins/ppapi/DEPS
@@ -1,8 +1,8 @@
 include_rules = [
-  "+app",
   "+gpu/command_buffer",
   "+ppapi/c",
   "+ppapi/shared_impl",
   "+printing",
   "+skia",
+  "+ui/base",
 ]
diff --git a/webkit/plugins/ppapi/ppb_pdf_impl.cc b/webkit/plugins/ppapi/ppb_pdf_impl.cc
index 364e9c3..cf0d1d0 100644
--- a/webkit/plugins/ppapi/ppb_pdf_impl.cc
+++ b/webkit/plugins/ppapi/ppb_pdf_impl.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 
-#include "app/resource_bundle.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -14,6 +13,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "unicode/usearch.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_gtk.cc
index 4defd31..eef26fb 100644
--- a/webkit/support/platform_support_gtk.cc
+++ b/webkit/support/platform_support_gtk.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/support/platform_support.h"
 
-#include "app/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -13,11 +12,12 @@
 #include "base/string_piece.h"
 #include "gfx/gfx_module.h"
 #include "grit/webkit_resources.h"
+#include "ui/base/resource/data_pack.h"
 
 namespace {
 
 // 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;
 
 base::StringPiece TestResourceProvider(int resource_id) {
   base::StringPiece res;
@@ -39,7 +39,7 @@ void BeforeInitialize(bool unit_test_mode) {
 void AfterInitialize(bool unit_test_mode) {
   if (unit_test_mode)
     return;  // We don't have a resource pack when running the unit-tests.
-  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("DumpRenderTree.pak");
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index d44195e..54319da 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -8,7 +8,6 @@
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
-#include "app/data_pack.h"
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -17,11 +16,12 @@
 #include "base/string16.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
+#include "ui/base/resource/data_pack.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
-static app::DataPack* g_resource_data_pack = NULL;
+static ui::DataPack* g_resource_data_pack = NULL;
 
 namespace webkit_support {
 
@@ -102,7 +102,7 @@ void AfterInitialize(bool unit_test_mode) {
     return;  // We don't have a resource pack when running the unit-tests.
 
   // Load a data pack.
-  g_resource_data_pack = new app::DataPack;
+  g_resource_data_pack = new ui::DataPack;
   NSString* resource_path =
       [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree"
                                           ofType:@"pak"];
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 7c9b0cc..8c5e7a1 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -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 @@ const FcChar8* FilePathAsFcChar(const FilePath& path) {
 }
 
 // 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 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
 
   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");
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 9378bea..7fed43c 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -9,7 +9,6 @@
 
 #include "webkit/tools/test_shell/test_shell.h"
 
-#include "app/data_pack.h"
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/debug/debugger.h"
@@ -30,6 +29,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/resource/data_pack.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
@@ -69,7 +69,7 @@ const int kTestWindowXLocation = -14000;
 const int kTestWindowYLocation = -14000;
 
 // Data pack resource. This is a pointer to the mmapped resources file.
-static app::DataPack* g_resource_data_pack = NULL;
+static ui::DataPack* g_resource_data_pack = NULL;
 
 // Define static member variables
 base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
@@ -209,7 +209,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
   // 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 app::DataPack;
+  g_resource_data_pack = new ui::DataPack;
   NSString *resource_path =
       [base::mac::MainAppBundle() pathForResource:@"test_shell"
                                           ofType:@"pak"];