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

webkit/support/platform_support_mac.mm

 // Copyright (c) 2010 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/support/platform_support.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 #import <objc/objc-runtime.h>
 
+#include "app/data_pack.h"
 #include "base/base_paths.h"
-#include "base/data_pack.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "grit/webkit_resources.h"
 #include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #import "webkit/support/drt_application_mac.h"
 #import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
 
-static base::DataPack* g_resource_data_pack = NULL;
+static app::DataPack* g_resource_data_pack = NULL;
 
 namespace webkit_support {
 
 static NSAutoreleasePool* autorelease_pool;
 
 void BeforeInitialize(bool unit_test_mode) {
   [CrDrtApplication sharedApplication];
   // Need to initialize NSAutoreleasePool before InitWebCoreSystemInterface().
   autorelease_pool = [[NSAutoreleasePool alloc] init];
   DCHECK(autorelease_pool);
@@ skipping 60 matching lines @@
   SwizzleAllMethods(object_getClass(imposterClass),
                     object_getClass(originalClass));
 #endif
 }
 
 void AfterInitialize(bool unit_test_mode) {
   if (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 base::DataPack;
+  g_resource_data_pack = new app::DataPack;
   NSString* resource_path =
       [mac_util::MainAppBundle() pathForResource:@"DumpRenderTree"
                                           ofType:@"pak"];
   FilePath resources_pak_path([resource_path fileSystemRepresentation]);
   if (!g_resource_data_pack->Load(resources_pak_path)) {
     LOG(FATAL) << "failed to load DumpRenderTree.pak";
   }
 
   // Load font files in the resource folder.
   static const char* const fontFileNames[] = {
@@ skipping 118 matching lines @@
     return res;
   }
 
   default:
     break;
   }
   return base::StringPiece();
 }
 
 }  // namespace webkit_glue