Add ability to store hidpi theme images in data pack

chrome/browser/themes/browser_theme_pack_unittest.cc

 // Copyright (c) 2012 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 "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
@@ skipping 108 matching lines @@
   void ParseImageNamesDictionary(DictionaryValue* value,
                                  std::map<int, FilePath>* out_file_paths) {
     theme_pack_->ParseImageNamesFromJSON(value, FilePath(), out_file_paths);
 
     // Build the source image list for HasCustomImage().
     theme_pack_->BuildSourceImagesArray(*out_file_paths);
   }
 
   bool LoadRawBitmapsTo(const std::map<int, FilePath>& out_file_paths) {
     return theme_pack_->LoadRawBitmapsTo(out_file_paths,
-                                         &theme_pack_->prepared_images_);
+                                         &theme_pack_->images_on_ui_thread_);
   }
 
   FilePath GetStarGazingPath() {
     FilePath test_path;
     if (!PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
       NOTREACHED();
       return test_path;
     }
 
     test_path = test_path.AppendASCII("profiles");
@@ skipping 283 matching lines @@
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(
             file, "mblmlcbknbnfebdfjnolmcapmdofhmme");
     ASSERT_TRUE(pack.get());
     VerifyStarGazing(pack.get());
   }
 }