Another performance improvement for phone library - at least +25% to previous cl (982ms for 100 i...

chrome/browser/autofill/phone_number.h

 // Copyright (c) 2011 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_AUTOFILL_PHONE_NUMBER_H_
 #define CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/form_group.h"
+#include "chrome/browser/autofill/phone_number_i18n.h"
 
 // A form group that stores phone number information.
 class PhoneNumber : public FormGroup {
  public:
   PhoneNumber();
   explicit PhoneNumber(AutofillType::FieldTypeGroup phone_group);
   PhoneNumber(const PhoneNumber& number);
   virtual ~PhoneNumber();
 
   PhoneNumber& operator=(const PhoneNumber& number);
@@ skipping 51 matching lines @@
  private:
   FRIEND_TEST_ALL_PREFIXES(PhoneNumberTest, Matcher);
 
   // The numbers will be digits only (no punctuation), so any call to the IsX()
   // functions should first call StripPunctuation on the text.
   bool IsNumber(const string16& text, const string16& number) const;
   bool IsWholeNumber(const string16& text) const;
 
   static void StripPunctuation(string16* number);
 
-  void ClearCachedNumbers() const;
-  // Updates cached parsed parts of the number. Returns false only if there was
-  // parsing involved and it failed.
-  bool UpdateCacheIfNeeded() const;
-
   // Phone group -  currently it is PHONE_HOME and PHONE_FAX.
   AutofillType::FieldTypeGroup phone_group_;
   // Locale for phone normalizing.
   std::string locale_;
   // The phone number.
   string16 number_;
 
-  // Cached parsed parts of the number.
-  mutable string16 cached_country_code_;
-  mutable string16 cached_city_code_;
-  mutable string16 cached_local_number_;
+  // Cached number.
+  autofill_i18n::PhoneObject cached_parsed_phone_;
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PHONE_NUMBER_H_