Change PYTHONPATH handling in tools/valgrind so we can un-revert http://coder...

tools/valgrind/valgrind_test.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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.
 
 # valgrind_test.py
 
 '''Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 '''
 
 import datetime
 import glob
 import logging
 import optparse
 import os
 import re
 import shutil
 import stat
 import sys
 import tempfile
 import time
 
 import common
 
 import memcheck_analyze
 import tsan_analyze
 
-import google.logging_utils
+import logging_utils
 
 class ValgrindTool(object):
 
   """Abstract class for running Valgrind.
 
   Always subclass this and implement ValgrindCommand() with platform specific
   stuff.
   """
 
   TMP_DIR = "valgrind.tmp"
@@ skipping 517 matching lines @@
       args.remove(arg)
       break
 
   tool = ToolFactory().Create(tool_name)
   MODULES_TO_SANITY_CHECK = ["base"]
   check_sanity = module in MODULES_TO_SANITY_CHECK
   return tool.Main(args, check_sanity)
 
 if __name__ == "__main__":
   if sys.argv.count("-v") > 0 or sys.argv.count("--verbose") > 0:
-    google.logging_utils.config_root(logging.DEBUG)
+    logging_utils.config_root(logging.DEBUG)
   else:
-    google.logging_utils.config_root()
+    logging_utils.config_root()
   # TODO(timurrrr): valgrind tools may use -v/--verbose as well
 
   ret = RunTool(sys.argv)
   sys.exit(ret)