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

chrome/browser/themes/browser_theme_pack.cc

 // 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 "chrome/browser/themes/browser_theme_pack.h"
 
+#include "app/data_pack.h"
 #include "app/resource_bundle.h"
-#include "base/data_pack.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
@@ skipping 344 matching lines @@
 
   // The BrowserThemePack is now in a consistent state.
   return pack;
 }
 
 // static
 scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack(
     FilePath path, const std::string& expected_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_refptr<BrowserThemePack> pack(new BrowserThemePack);
-  pack->data_pack_.reset(new base::DataPack);
+  pack->data_pack_.reset(new app::DataPack);
 
   if (!pack->data_pack_->Load(path)) {
     LOG(ERROR) << "Failed to load theme data pack.";
     return NULL;
   }
 
   base::StringPiece pointer;
   if (!pack->data_pack_->GetStringPiece(kHeaderID, &pointer))
     return NULL;
   pack->header_ = reinterpret_cast<BrowserThemePackHeader*>(const_cast<char*>(
@@ skipping 57 matching lines @@
   resources[kSourceImagesID] = base::StringPiece(
       reinterpret_cast<const char*>(source_images_),
       source_count * sizeof(*source_images_));
 
   AddRawImagesTo(image_memory_, &resources);
 
   RawImages reencoded_images;
   RepackImages(prepared_images_, &reencoded_images);
   AddRawImagesTo(reencoded_images, &resources);
 
-  return base::DataPack::WritePack(path, resources);
+  return app::DataPack::WritePack(path, resources);
 }
 
 bool BrowserThemePack::GetTint(int id, color_utils::HSL* hsl) const {
   if (tints_) {
     for (int i = 0; i < kTintArraySize; ++i) {
       if (tints_[i].id == id) {
         hsl->h = tints_[i].h;
         hsl->s = tints_[i].s;
         hsl->l = tints_[i].l;
         return true;
@@ skipping 114 matching lines @@
       colors_(NULL),
       display_properties_(NULL),
       source_images_(NULL) {
 }
 
 void BrowserThemePack::BuildHeader(const Extension* extension) {
   header_ = new BrowserThemePackHeader;
   header_->version = kThemePackVersion;
 
   // TODO(erg): Need to make this endian safe on other computers. Prerequisite
-  // is that base::DataPack removes this same check.
+  // is that app::DataPack removes this same check.
 #if defined(__BYTE_ORDER)
   // Linux check
   COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
                  datapack_assumes_little_endian);
 #elif defined(__BIG_ENDIAN__)
   // Mac check
   #error DataPack assumes little endian
 #endif
   header_->little_endian = 1;
 
@@ skipping 444 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return BrowserThemeProvider::GetDefaultTint(id);
 }