Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/browser/extensions/extension_page_actions_module.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/extensions/extension_page_actions_module.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_page_actions_module_constants.h"
@@ skipping 143 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger("tabId", &tab_id));
   if (!InitCommon(tab_id))
     return false;
 
   // setIcon can take a variant argument: either a canvas ImageData, or an
   // icon index.
   base::BinaryValue* binary;
   int icon_index;
   if (args->GetBinary("imageData", &binary)) {
     IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
-    void* iter = NULL;
+    PickleIterator iter(bitmap_pickle);
     scoped_ptr<SkBitmap> bitmap(new SkBitmap);
     EXTENSION_FUNCTION_VALIDATE(
         IPC::ReadParam(&bitmap_pickle, &iter, bitmap.get()));
     page_action_->SetIcon(tab_id, *bitmap);
   } else if (args->GetInteger("iconIndex", &icon_index)) {
     if (icon_index < 0 || static_cast<size_t>(icon_index) >=
                               page_action_->icon_paths()->size()) {
       error_ = kIconIndexOutOfBounds;
       return false;
     }
@@ skipping 110 matching lines @@
   if (!InitCommon(tab_id))
     return false;
 
   std::string text;
   EXTENSION_FUNCTION_VALIDATE(args->GetString("text", &text));
 
   page_action_->SetBadgeText(tab_id, text);
   contents_->extension_tab_helper()->PageActionStateChanged();
   return true;
 }