Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/browser/password_manager/native_backend_kwallet_x.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/profiles/profile.h"
 
 class Pickle;
+class PickleIterator;
 class PrefService;
 
 namespace webkit {
 namespace forms {
 struct PasswordForm;
 }
 }
 
 namespace base {
 class WaitableEvent;
@@ skipping 94 matching lines @@
   // Serializes a list of PasswordForms to be stored in the wallet.
   static void SerializeValue(const PasswordFormList& forms, Pickle* pickle);
 
   // Checks a serialized list of PasswordForms for sanity. Returns true if OK.
   // Note that |realm| is only used for generating a useful warning message.
   static bool CheckSerializedValue(const uint8_t* byte_array, size_t length,
                                    const std::string& realm);
 
   // Convenience function to read a GURL from a Pickle. Assumes the URL has
   // been written as a std::string. Returns true on success.
-  static bool ReadGURL(const Pickle& pickle, void** iter, GURL* url);
+  static bool ReadGURL(const Pickle& pickle, PickleIterator* iter, GURL* url);
 
   // In case the fields in the pickle ever change, version them so we can try to
   // read old pickles. (Note: do not eat old pickles past the expiration date.)
   static const int kPickleVersion = 0;
 
   // Name of the folder to store passwords in.
   static const char kKWalletFolder[];
 
   // DBus service, path, and interface names for klauncher and kwalletd.
   static const char kKWalletServiceName[];
@@ skipping 28 matching lines @@
 
   // The name of the wallet we've opened. Set during Init().
   std::string wallet_name_;
   // The application name (e.g. "Chromium"), shown in KWallet auth dialogs.
   const std::string app_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendKWallet);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_