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

third_party/libphonenumber/cpp/src/phonenumberutil.cc

 // Copyright (C) 2009 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 11 matching lines @@
 #include <iostream>
 #include <map>
 #include <sstream>
 #include <vector>
 
 #include <google/protobuf/message_lite.h>
 #include <unicode/errorcode.h>
 #include <unicode/translit.h>
 
 #include "base/logging.h"
-#include "base/singleton.h"
+#include "base/memory/singleton.h"
 #include "default_logger.h"
 #include "logger_adapter.h"
 #include "metadata.h"
 #include "phonemetadata.pb.h"
 #include "phonenumber.h"
 #include "phonenumber.pb.h"
 #include "regexp_adapter.h"
 #include "stringutil.h"
 #include "utf/unicodetext.h"
 #include "utf/utf.h"
@@ skipping 2216 matching lines @@
       }
     }
   }
   // One or more of the phone numbers we are trying to match is not a viable
   // phone number.
   return INVALID_NUMBER;
 }
 
 }  // namespace phonenumbers
 }  // namespace i18n