Revert of Remove deprecated methods from Pickle.

extensions/common/user_script.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 "extensions/common/user_script.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
@@ skipping 113 matching lines @@
 
 void UserScript::File::Pickle(::Pickle* pickle) const {
   pickle->WriteString(url_.spec());
   // Do not write path. It's not needed in the renderer.
   // Do not write content. It will be serialized by other means.
 }
 
 void UserScript::File::Unpickle(const ::Pickle& pickle, PickleIterator* iter) {
   // Read the url from the pickle.
   std::string url;
-  CHECK(iter->ReadString(&url));
+  CHECK(pickle.ReadString(iter, &url));
   set_url(GURL(url));
 }
 
 void UserScript::Pickle(::Pickle* pickle) const {
   // Write the simple types to the pickle.
   pickle->WriteInt(run_location());
   pickle->WriteString(extension_id());
   pickle->WriteInt(user_script_id_);
   pickle->WriteBool(emulate_greasemonkey());
   pickle->WriteBool(match_all_frames());
@@ skipping 32 matching lines @@
   pickle->WriteSizeT(scripts.size());
   for (FileList::const_iterator file = scripts.begin();
        file != scripts.end(); ++file) {
     file->Pickle(pickle);
   }
 }
 
 void UserScript::Unpickle(const ::Pickle& pickle, PickleIterator* iter) {
   // Read the run location.
   int run_location = 0;
-  CHECK(iter->ReadInt(&run_location));
+  CHECK(pickle.ReadInt(iter, &run_location));
   CHECK(run_location >= 0 && run_location < RUN_LOCATION_LAST);
   run_location_ = static_cast<RunLocation>(run_location);
 
-  CHECK(iter->ReadString(&extension_id_));
-  CHECK(iter->ReadInt(&user_script_id_));
-  CHECK(iter->ReadBool(&emulate_greasemonkey_));
-  CHECK(iter->ReadBool(&match_all_frames_));
-  CHECK(iter->ReadBool(&match_about_blank_));
-  CHECK(iter->ReadBool(&incognito_enabled_));
+  CHECK(pickle.ReadString(iter, &extension_id_));
+  CHECK(pickle.ReadInt(iter, &user_script_id_));
+  CHECK(pickle.ReadBool(iter, &emulate_greasemonkey_));
+  CHECK(pickle.ReadBool(iter, &match_all_frames_));
+  CHECK(pickle.ReadBool(iter, &match_about_blank_));
+  CHECK(pickle.ReadBool(iter, &incognito_enabled_));
 
   UnpickleGlobs(pickle, iter, &globs_);
   UnpickleGlobs(pickle, iter, &exclude_globs_);
   UnpickleURLPatternSet(pickle, iter, &url_set_);
   UnpickleURLPatternSet(pickle, iter, &exclude_url_set_);
   UnpickleScripts(pickle, iter, &js_scripts_);
   UnpickleScripts(pickle, iter, &css_scripts_);
 }
 
 void UserScript::UnpickleGlobs(const ::Pickle& pickle, PickleIterator* iter,
                                std::vector<std::string>* globs) {
   size_t num_globs = 0;
-  CHECK(iter->ReadSizeT(&num_globs));
+  CHECK(pickle.ReadSizeT(iter, &num_globs));
   globs->clear();
   for (size_t i = 0; i < num_globs; ++i) {
     std::string glob;
-    CHECK(iter->ReadString(&glob));
+    CHECK(pickle.ReadString(iter, &glob));
     globs->push_back(glob);
   }
 }
 
 void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
                                        PickleIterator* iter,
                                        URLPatternSet* pattern_list) {
   size_t num_patterns = 0;
-  CHECK(iter->ReadSizeT(&num_patterns));
+  CHECK(pickle.ReadSizeT(iter, &num_patterns));
 
   pattern_list->ClearPatterns();
   for (size_t i = 0; i < num_patterns; ++i) {
     int valid_schemes;
-    CHECK(iter->ReadInt(&valid_schemes));
+    CHECK(pickle.ReadInt(iter, &valid_schemes));
 
     std::string pattern_str;
-    CHECK(iter->ReadString(&pattern_str));
+    CHECK(pickle.ReadString(iter, &pattern_str));
 
     URLPattern pattern(kValidUserScriptSchemes);
     URLPattern::ParseResult result = pattern.Parse(pattern_str);
     CHECK(URLPattern::PARSE_SUCCESS == result) <<
         URLPattern::GetParseResultString(result) << " " << pattern_str.c_str();
 
     pattern.SetValidSchemes(valid_schemes);
     pattern_list->AddPattern(pattern);
   }
 }
 
 void UserScript::UnpickleScripts(const ::Pickle& pickle, PickleIterator* iter,
                                  FileList* scripts) {
   size_t num_files = 0;
-  CHECK(iter->ReadSizeT(&num_files));
+  CHECK(pickle.ReadSizeT(iter, &num_files));
   scripts->clear();
   for (size_t i = 0; i < num_files; ++i) {
     File file;
     file.Unpickle(pickle, iter);
     scripts->push_back(file);
   }
 }
 
 bool operator<(const UserScript& script1, const UserScript& script2) {
   // The only kind of script that should be compared is the kind that has its
   // IDs initialized to a meaningful value.
   DCHECK(script1.id() != -1 && script2.id() != -1);
   return script1.id() < script2.id();
 }
 
 }  // namespace extensions