Revert 255357 "Change the user action file format from .txt to ...."

trunk/src/tools/metrics/histograms/update_extension_functions.py

 # 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.
 
 """Updates ExtensionFunctions enum in histograms.xml file with values read from
 extension_function_histogram_value.h.
 
 If the file was pretty-printed, the updated version is pretty-printed too.
 """
 
 import logging
 import re
 import sys
 
 from xml.dom import minidom
-import print_style
 
-# Import the metrics/common module.
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
-from diff_util import PromptUserToAcceptDiff
+from diffutil import PromptUserToAcceptDiff
+from pretty_print import PrettyPrintNode
 
 HISTOGRAMS_PATH = 'histograms.xml'
 ENUM_NAME = 'ExtensionFunctions'
 
 EXTENSION_FUNCTIONS_HISTOGRAM_VALUE_PATH = \
   '../../../extensions/browser/extension_function_histogram_value.h'
 ENUM_START_MARKER = "^enum HistogramValue {"
 ENUM_END_MARKER = "^ENUM_BOUNDARY"
 
 
@@ skipping 100 matching lines @@
   Log('Reading existing histograms from "%s".' % (HISTOGRAMS_PATH))
   with open(HISTOGRAMS_PATH, 'rb') as f:
     histograms_doc = minidom.parse(f)
     f.seek(0)
     xml = f.read()
 
   Log('Comparing histograms enum with new enum definition.')
   UpdateHistogramDefinitions(histogram_values, histograms_doc)
 
   Log('Writing out new histograms file.')
-  new_xml = print_style.GetPrintStyle().PrettyPrintNode(histograms_doc)
-
+  new_xml = PrettyPrintNode(histograms_doc)
   if PromptUserToAcceptDiff(xml, new_xml, 'Is the updated version acceptable?'):
     with open(HISTOGRAMS_PATH, 'wb') as f:
       f.write(new_xml)
 
   Log('Done.')
 
 
 if __name__ == '__main__':
   main()