implement SetWatchEvent and WaitForEvent for trace-based-tests

content/browser/trace_controller_impl.h

Index: content/browser/trace_controller_impl.h
diff --git a/content/browser/trace_controller_impl.h b/content/browser/trace_controller_impl.h
index 18fd5391533088fdea6b71fbf0b7c4f8ba56dd1b..0b233abf52fad237c1454a0ae58fe52b3fa686db 100644
--- a/content/browser/trace_controller_impl.h
+++ b/content/browser/trace_controller_impl.h
@@ -46,6 +46,10 @@ class TraceControllerImpl : public TraceController {
   virtual  bool EndTracingAsync(TraceSubscriber* subscriber) OVERRIDE;
   virtual bool GetTraceBufferPercentFullAsync(
       TraceSubscriber* subscriber) OVERRIDE;
+  virtual bool SetWatchEvent(TraceSubscriber* subscriber,
+                             const std::string& category_name,
+                             const std::string& event_name) OVERRIDE;
+  virtual bool CancelWatchEvent(TraceSubscriber* subscriber) OVERRIDE;
   virtual void CancelSubscriber(TraceSubscriber* subscriber) OVERRIDE;
 
  private:
@@ -85,7 +89,7 @@ class TraceControllerImpl : public TraceController {
   void OnEndTracingAck(const std::vector<std::string>& known_categories);
   void OnTraceDataCollected(
       const scoped_refptr<base::RefCountedString>& events_str_ptr);
-  void OnTraceBufferFull();
+  void OnTraceNotification(int notification);
   void OnTraceBufferPercentFullReply(float percent_full);
 
   FilterMap filters_;
@@ -100,6 +104,8 @@ class TraceControllerImpl : public TraceController {
   std::set<std::string> known_categories_;
   std::vector<std::string> included_categories_;
   std::vector<std::string> excluded_categories_;
+  std::string watch_category_;
+  std::string watch_name_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceControllerImpl);
 };