Implementing a Monsoon power monitor trace agent, utilizing the UI infrastructure that the BattOr a…

common/monsoon/monsoon/__init__.py

Index: common/monsoon/monsoon/__init__.py
diff --git a/systrace/systrace/__init__.py b/common/monsoon/monsoon/__init__.py
similarity index 56%
copy from systrace/systrace/__init__.py
copy to common/monsoon/monsoon/__init__.py
index 831f7743126f478091dd731b7749167b589e89c7..4082cba6717be9ec709d013a660a26b14d5d7de3 100644
--- a/systrace/systrace/__init__.py
+++ b/common/monsoon/monsoon/__init__.py
@@ -17,12 +17,8 @@ def _AddDirToPythonPath(*path_parts):
     sys.path.insert(1, path)
 
 _CATAPULT_DIR = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), os.path.pardir, os.path.pardir)
+    os.path.dirname(os.path.abspath(__file__)),
+                    os.path.pardir, os.path.pardir, os.path.pardir)
 
-_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'battor')
-_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'py_utils')
-_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'py_trace_event')
-_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'py_trace_event', 'py_trace_event')
-_AddDirToPythonPath(_CATAPULT_DIR, 'devil')
-_AddDirToPythonPath(_CATAPULT_DIR, 'systrace')
-_AddDirToPythonPath(_CATAPULT_DIR, 'tracing')
+_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'monsoon')
+_AddDirToPythonPath(_CATAPULT_DIR, 'common', 'py_utils')