Push preg_parser and registry_dict changes upstream

components/policy/core/common/preg_parser.h

Index: components/policy/core/common/preg_parser.h
diff --git a/components/policy/core/common/preg_parser_win.h b/components/policy/core/common/preg_parser.h
similarity index 87%
rename from components/policy/core/common/preg_parser_win.h
rename to components/policy/core/common/preg_parser.h
index 7e0ee48b34c0ac7443a2e817c19db636762e475e..03872a47a182bdd77a15b3f303789c0dc666fe2f 100644
--- a/components/policy/core/common/preg_parser_win.h
+++ b/components/policy/core/common/preg_parser.h
@@ -7,8 +7,8 @@
 //
 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa374407(v=vs.85).aspx
 
-#ifndef COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_WIN_H_
-#define COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_WIN_H_
+#ifndef COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_H_
+#define COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_H_
 
 #include <memory>
 #include <vector>
@@ -41,4 +41,4 @@ POLICY_EXPORT bool ReadFile(const base::FilePath& file_path,
 }  // namespace preg_parser
 }  // namespace policy
 
-#endif  // COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_WIN_H_
+#endif  // COMPONENTS_POLICY_CORE_COMMON_PREG_PARSER_H_