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

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
 #include <signal.h>
 #include <unistd.h>
 
-#include "base/data_pack.h"
+#include "app/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "grit/test_shell_resources.h"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
@@ skipping 13 matching lines @@
 
 namespace {
 
 // Convert a FilePath into an FcChar* (used by fontconfig).
 // The pointer only lives for the duration for the expression.
 const FcChar8* FilePathAsFcChar(const FilePath& path) {
   return reinterpret_cast<const FcChar8*>(path.value().c_str());
 }
 
 // Data resources on linux.  This is a pointer to the mmapped resources file.
-base::DataPack* g_resource_data_pack = NULL;
+app::DataPack* g_resource_data_pack = NULL;
 
 void TerminationSignalHandler(int signatl) {
   TestShell::ShutdownTestShell();
   exit(0);
 }
 
 // GTK callbacks ------------------------------------------------------
 
 // Callback for when the main window is destroyed.
 gboolean MainWindowDestroyed(GtkWindow* window, TestShell* shell) {
@@ skipping 93 matching lines @@
 
 // static
 void TestShell::InitializeTestShell(bool layout_test_mode,
                                     bool allow_external_pages) {
   window_list_ = new WindowList;
   layout_test_mode_ = layout_test_mode;
   allow_external_pages_ = allow_external_pages;
 
   web_prefs_ = new WebPreferences;
 
-  g_resource_data_pack = new base::DataPack;
+  g_resource_data_pack = new app::DataPack;
   FilePath data_path;
   PathService::Get(base::DIR_EXE, &data_path);
   data_path = data_path.Append("test_shell.pak");
   if (!g_resource_data_pack->Load(data_path)) {
     LOG(FATAL) << "failed to load test_shell.pak";
   }
 
   FilePath resources_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &resources_dir);
   resources_dir = resources_dir.Append("webkit/tools/test_shell/resources");
@@ skipping 479 matching lines @@
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 }  // namespace webkit_glue