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

app/resource_bundle.h

 // 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.
 
 #ifndef APP_RESOURCE_BUNDLE_H_
 #define APP_RESOURCE_BUNDLE_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted_memory.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "gfx/native_widget_types.h"
 
-namespace base {
+namespace app {
 class DataPack;
 }
 #if defined(USE_X11)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 namespace gfx {
 class Font;
 }
 class Lock;
 class SkBitmap;
@@ skipping 134 matching lines @@
   class LoadedDataPack {
    public:
     explicit LoadedDataPack(const FilePath& path);
     ~LoadedDataPack();
     bool GetStringPiece(int resource_id, base::StringPiece* data) const;
     RefCountedStaticMemory* GetStaticMemory(int resource_id) const;
 
    private:
     void Load();
 
-    scoped_ptr<base::DataPack> data_pack_;
+    scoped_ptr<app::DataPack> data_pack_;
     FilePath path_;
 
     DISALLOW_COPY_AND_ASSIGN(LoadedDataPack);
   };
 
   // We define a DataHandle typedef to abstract across how data is stored
   // across platforms.
 #if defined(OS_WIN)
   // Windows stores resources in DLLs, which are managed by HINSTANCE.
   typedef HINSTANCE DataHandle;
 #elif defined(USE_BASE_DATA_PACK)
   // Linux uses base::DataPack.
-  typedef base::DataPack* DataHandle;
+  typedef app::DataPack* DataHandle;
 #endif
 
   // Ctor/dtor are private, since we're a singleton.
   ResourceBundle();
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
 
 #if defined(USE_X11)
@@ skipping 65 matching lines @@
   scoped_ptr<gfx::Font> medium_bold_font_;
   scoped_ptr<gfx::Font> large_font_;
   scoped_ptr<gfx::Font> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 #endif  // APP_RESOURCE_BUNDLE_H_