Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/common/extensions/user_script_unittest.cc

-// 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.
 
 #include "base/file_path.h"
 #include "base/pickle.h"
 #include "chrome/common/extensions/user_script.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static const int kAllSchemes =
@@ skipping 170 matching lines @@
   script1.set_run_location(UserScript::DOCUMENT_START);
 
   script1.add_url_pattern(pattern1);
   script1.add_url_pattern(pattern2);
   script1.add_exclude_url_pattern(exclude1);
   script1.add_exclude_url_pattern(exclude2);
 
   Pickle pickle;
   script1.Pickle(&pickle);
 
-  void* iter = NULL;
+  PickleIterator iter(pickle);
   UserScript script2;
   script2.Unpickle(pickle, &iter);
 
   EXPECT_EQ(1U, script2.js_scripts().size());
   EXPECT_EQ(script1.js_scripts()[0].url(), script2.js_scripts()[0].url());
 
   EXPECT_EQ(2U, script2.css_scripts().size());
   for (size_t i = 0; i < script2.js_scripts().size(); ++i) {
     EXPECT_EQ(script1.css_scripts()[i].url(), script2.css_scripts()[i].url());
   }
 
   ASSERT_EQ(script1.globs().size(), script2.globs().size());
   for (size_t i = 0; i < script1.globs().size(); ++i) {
     EXPECT_EQ(script1.globs()[i], script2.globs()[i]);
   }
 
   ASSERT_EQ(script1.url_patterns(), script2.url_patterns());
   ASSERT_EQ(script1.exclude_url_patterns(), script2.exclude_url_patterns());
 }
 
 TEST(ExtensionUserScriptTest, Defaults) {
   UserScript script;
   ASSERT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }