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

chrome/tools/mac_helpers/infoplist_strings_util.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 // Helper tool that is built and run during a build to pull strings from
 // the GRD files and generate the InfoPlist.strings files needed for
 // Mac OS X app bundles.
 
 #import <Foundation/Foundation.h>
 
 #include <stdio.h>
 #include <unistd.h>
 
-#include "base/data_pack.h"
+#include "app/data_pack.h"
 #include "base/file_path.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "grit/chromium_strings.h"
 
 namespace {
 
 NSString* ApplicationVersionString(const char* version_file_path) {
@@ skipping 19 matching lines @@
       [scanner scanInt:&build] &&
       [scanner scanString:@"PATCH=" intoString:nil] &&
       [scanner scanInt:&patch]) {
     return [NSString stringWithFormat:@"%d.%d.%d.%d",
             major, minor, build, patch];
   }
   fprintf(stderr, "Failed to parse version file\n");
   return nil;
 }
 
-base::DataPack* LoadResourceDataPack(const char* dir_path,
-                                     const char* branding_strings_name,
-                                     const char* locale_name) {
-  base::DataPack* resource_pack = NULL;
+app::DataPack* LoadResourceDataPack(const char* dir_path,
+                                    const char* branding_strings_name,
+                                    const char* locale_name) {
+  ase::DataPack* resource_pack = NULL;
 
   NSString* resource_path = [NSString stringWithFormat:@"%s/%s_%s.pak",
                              dir_path, branding_strings_name, locale_name];
   if (resource_path) {
     FilePath resources_pak_path([resource_path fileSystemRepresentation]);
-    resource_pack = new base::DataPack;
+    resource_pack = new ase::DataPack;
     bool success = resource_pack->Load(resources_pak_path);
     if (!success) {
       delete resource_pack;
       resource_pack = NULL;
     }
   }
 
   return resource_pack;
 }
 
-NSString* LoadStringFromDataPack(base::DataPack* data_pack,
+NSString* LoadStringFromDataPack(ase::DataPack* data_pack,
                                  const char* data_pack_lang,
                                  uint32_t resource_id,
                                  const char* resource_id_str) {
   NSString* result = nil;
   base::StringPiece data;
   if (data_pack->GetStringPiece(resource_id, &data)) {
     // Data pack encodes strings as UTF16.
     result =
         [[[NSString alloc] initWithBytes:data.data()
                                   length:data.length()
@@ skipping 112 matching lines @@
     fprintf(stderr, "ERROR: failed to get a version string");
     exit(1);
   }
 
   NSFileManager* fm = [NSFileManager defaultManager];
 
   for (int loop = 0; loop < lang_list_count; ++loop) {
     const char* cur_lang = lang_list[loop];
 
     // Open the branded string pak file
-    scoped_ptr<base::DataPack> branded_data_pack(
+    scoped_ptr<ase::DataPack> branded_data_pack(
         LoadResourceDataPack(grit_output_dir,
                              branding_strings_name,
                              cur_lang));
     if (branded_data_pack.get() == NULL) {
       fprintf(stderr, "ERROR: Failed to load branded pak for language: %s\n",
               cur_lang);
       exit(1);
     }
 
     uint32_t name_id = IDS_PRODUCT_NAME;
@@ skipping 78 matching lines @@
         [output_path stringByAppendingPathComponent:@"InfoPlist.strings"];
     if (![strings_file_contents_utf8 writeToFile:output_path
                                       atomically:YES]) {
       fprintf(stderr, "ERROR: Failed to write out '%s'\n",
               [output_path UTF8String]);
       exit(1);
     }
   }
   return 0;
 }