Revert 237280 "Remove TraceController"

trunk/src/chrome/browser/automation/automation_provider.h

 // Copyright (c) 2012 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.
 
 // This implements a browser-side endpoint for UI automation activity.
 // The client-side endpoint is implemented by AutomationProxy.
 // The entire lifetime of this object should be contained within that of
 // the BrowserProcess, and in particular the NotificationService that's
 // hung off of it.
 
@@ skipping 11 matching lines @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
+#include "content/public/browser/trace_subscriber.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/gfx/native_widget_types.h"
 #endif  // defined(OS_WIN) && !defined(USE_AURA)
 
 class AutomationBrowserTracker;
 class AutomationResourceMessageFilter;
@@ skipping 32 matching lines @@
 
 namespace gfx {
 class Point;
 }
 
 class AutomationProvider
     : public IPC::Listener,
       public IPC::Sender,
       public base::SupportsWeakPtr<AutomationProvider>,
       public base::RefCountedThreadSafe<
-          AutomationProvider, content::BrowserThread::DeleteOnUIThread> {
+          AutomationProvider, content::BrowserThread::DeleteOnUIThread>,
+      public content::TraceSubscriber {
  public:
   explicit AutomationProvider(Profile* profile);
 
   Profile* profile() const { return profile_; }
 
   void set_profile(Profile* profile);
 
   // Initializes a channel for a connection to an AutomationProxy.
   // If channel_id starts with kNamedInterfacePrefix, it will act
   // as a server, create a named IPC socket with channel_id as its
@@ skipping 111 matching lines @@
       bool find_next,
       IPC::Message* reply_message);
 
   scoped_refptr<AutomationResourceMessageFilter>
       automation_resource_message_filter_;
 
   // True iff we should open a new automation IPC channel if it closes.
   bool reinitialize_on_channel_error_;
 
  private:
+  // Storage for EndTracing() to resume operations after a callback.
+  struct TracingData {
+    std::list<std::string> trace_output;
+    scoped_ptr<IPC::Message> reply_message;
+  };
+
+  // TraceSubscriber:
+  virtual void OnEndTracingComplete() OVERRIDE;
+  virtual void OnTraceDataCollected(
+      const scoped_refptr<base::RefCountedString>& trace_fragment) OVERRIDE;
+
   void OnUnhandledMessage(const IPC::Message& message);
 
   // Clear and reinitialize the automation IPC channel.
   bool ReinitializeChannel();
 
   void HandleUnused(const IPC::Message& message, int handle);
   void GetFilteredInetHitCount(int* hit_count);
   void SetProxyConfig(const std::string& new_proxy_config);
 
   // Responds to the FindInPage request, retrieves the search query parameters,
   // launches an observer to listen for results and issues a StartFind request.
   void HandleFindRequest(int handle,
                          const AutomationMsg_Find_Params& params,
                          IPC::Message* reply_message);
 
   void OnSetPageFontSize(int tab_handle, int font_size);
 
   // See browsing_data_remover.h for explanation of bitmap fields.
   void RemoveBrowsingData(int remove_mask);
 
   // Notify the JavaScript engine in the render to change its parameters
   // while performing stress testing. See
   // |ViewHostMsg_JavaScriptStressTestControl_Commands| in render_messages.h
   // for information on the arguments.
   void JavaScriptStressTestControl(int handle, int cmd, int param);
 
   void BeginTracing(const std::string& category_patterns, bool* success);
   void EndTracing(IPC::Message* reply_message);
-  void OnTraceDataCollected(IPC::Message* reply_message,
-                            const base::FilePath& path);
+  void GetTracingOutput(std::string* chunk, bool* success);
 
   // Asynchronous request for printing the current tab.
   void PrintAsync(int tab_handle);
 
   // Uses the specified encoding to override the encoding of the page in the
   // specified tab.
   void OverrideEncoding(int tab_handle,
                         const std::string& encoding_name,
                         bool* success);
 
@@ skipping 76 matching lines @@
 
   // True iff browser finished loading initial set of tabs.
   bool initial_tab_loads_complete_;
 
   // True iff ChromeOS webui login ui is ready.
   bool login_webui_ready_;
 
   // ID of automation channel.
   std::string channel_id_;
 
+  // Trace data that has been collected but not flushed to the automation
+  // client.
+  TracingData tracing_data_;
+
   DISALLOW_COPY_AND_ASSIGN(AutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_H_