| Index: content/shell/browser/blink_test_controller.h
|
| diff --git a/content/shell/browser/blink_test_controller.h b/content/shell/browser/blink_test_controller.h
|
| index bd05323077170c92ed16657a1e88fcbbddeea9cc..a955df04367717ecc702bb15338664de49be1de9 100644
|
| --- a/content/shell/browser/blink_test_controller.h
|
| +++ b/content/shell/browser/blink_test_controller.h
|
| @@ -10,8 +10,10 @@
|
|
|
| #include "base/cancelable_callback.h"
|
| #include "base/files/file_path.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/non_thread_safe.h"
|
| +#include "content/public/browser/bluetooth_chooser.h"
|
| #include "content/public/browser/gpu_data_manager_observer.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -28,6 +30,7 @@ class SkBitmap;
|
|
|
| namespace content {
|
|
|
| +class LayoutTestBluetoothChooserFactory;
|
| class LayoutTestDevToolsFrontend;
|
| class Shell;
|
|
|
| @@ -123,6 +126,10 @@ class BlinkTestController : public base::NonThreadSafe,
|
| void OpenURL(const GURL& url);
|
| void TestFinishedInSecondaryWindow();
|
| bool IsMainWindow(WebContents* web_contents) const;
|
| + scoped_ptr<BluetoothChooser> RunBluetoothChooser(
|
| + WebContents* web_contents,
|
| + const BluetoothChooser::EventHandler& event_handler,
|
| + const GURL& origin);
|
|
|
| BlinkTestResultPrinter* printer() { return printer_.get(); }
|
| void set_printer(BlinkTestResultPrinter* printer) { printer_.reset(printer); }
|
| @@ -175,6 +182,10 @@ class BlinkTestController : public base::NonThreadSafe,
|
| void OnCloseRemainingWindows();
|
| void OnResetDone();
|
| void OnLeakDetectionDone(const content::LeakDetectionResult& result);
|
| + void OnSetBluetoothManualChooser(bool enable);
|
| + void OnGetBluetoothManualChooserEvents(std::vector<std::string>* events);
|
| + void OnSendBluetoothManualChooserEvent(const std::string& event,
|
| + const std::string& argument);
|
|
|
| scoped_ptr<BlinkTestResultPrinter> printer_;
|
|
|
| @@ -214,6 +225,8 @@ class BlinkTestController : public base::NonThreadSafe,
|
|
|
| LayoutTestDevToolsFrontend* devtools_frontend_;
|
|
|
| + scoped_ptr<LayoutTestBluetoothChooserFactory> bluetooth_chooser_factory_;
|
| +
|
| #if defined(OS_ANDROID)
|
| // Because of the nested message pump implementation, Android needs to allow
|
| // waiting on the UI thread while layout tests are being ran.
|
|
|