remove references to DEPRECATED SkBitmap::kA1_Config. No functional change expected.

chrome/browser/ui/app_list/fast_show_pickler.cc

 // Copyright 2013 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/ui/app_list/fast_show_pickler.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/app_list/app_list_item_model.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
 namespace {
 
 using app_list::AppListItemModel;
 using app_list::AppListModel;
 
 // These have the same meaning as SkBitmap::Config. Reproduced here to insure
 // against their value changing in Skia. If the order of these changes kVersion
 // should be incremented.
 enum ImageFormat {
   NONE,
-  A1,
+//  A1, // kA1_Config is DEPRECATED
   A8,
   INDEX_8,
   RGB_565,
   ARGB_4444,
   ARGB_8888,
 };
 
 bool FormatToConfig(ImageFormat format, SkBitmap::Config* out) {
   switch (format) {
     case NONE:
       *out = SkBitmap::kNo_Config;
       break;
-    case A1:
-      *out = SkBitmap::kA1_Config;
-      break;
     case A8:
       *out = SkBitmap::kA8_Config;
       break;
     case INDEX_8:
       *out = SkBitmap::kIndex8_Config;
       break;
     case RGB_565:
       *out = SkBitmap::kRGB_565_Config;
       break;
     case ARGB_4444:
       *out = SkBitmap::kARGB_4444_Config;
       break;
     case ARGB_8888:
       *out = SkBitmap::kARGB_8888_Config;
       break;
     default: return false;
   }
   return true;
 }
 
 bool ConfigToFormat(SkBitmap::Config config, ImageFormat* out) {
   switch (config) {
     case SkBitmap::kNo_Config:
       *out = NONE;
       break;
-    case SkBitmap::kA1_Config:
-      *out = A1;
-      break;
     case SkBitmap::kA8_Config:
       *out = A8;
       break;
     case SkBitmap::kIndex8_Config:
       *out = INDEX_8;
       break;
     case SkBitmap::kRGB_565_Config:
       *out = RGB_565;
       break;
     case SkBitmap::kARGB_4444_Config:
@@ skipping 116 matching lines @@
 
 void CopyOverItem(AppListItemModel* src_item, AppListItemModel* dest_item) {
   dest_item->SetTitleAndFullName(src_item->title(), src_item->full_name());
   dest_item->SetIcon(src_item->icon(), src_item->has_shadow());
 }
 
 }  // namespace
 
 // The version of the pickle format defined here. This needs to be incremented
 // whenever this format is changed so new clients can invalidate old versions.
-const int FastShowPickler::kVersion = 1;
+const int FastShowPickler::kVersion = 2;
 
 scoped_ptr<Pickle> FastShowPickler::PickleAppListModelForFastShow(
     AppListModel* model) {
   scoped_ptr<Pickle> result(new Pickle);
   if (!result->WriteInt(kVersion))
     return scoped_ptr<Pickle>();
   if (!result->WriteBool(model->signed_in()))
     return scoped_ptr<Pickle>();
   if (!result->WriteInt((int) model->item_list()->item_count()))
     return scoped_ptr<Pickle>();
@@ skipping 34 matching lines @@
   model->SetSignedIn(signed_in);
   for (int i = 0; i < app_count; ++i) {
     scoped_ptr<AppListItemModel> item(UnpickleAppListItemModel(&it).Pass());
     if (!item)
       return scoped_ptr<AppListModel>();
     model->item_list()->AddItem(item.release());
   }
 
   return model.Pass();
 }