Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Unified Diff: components/test_runner/test_runner.cc

Issue 1815483003: bluetooth: Create Mojo equivalent of SetBluetoothMockDataSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo
Patch Set: Clean up Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/test_runner/test_runner.cc
diff --git a/components/test_runner/test_runner.cc b/components/test_runner/test_runner.cc
index a5cf1865625a7625876c0dd814bf72e812a35774..37796ae41f14253425e355061bea2c249cd801e8 100644
--- a/components/test_runner/test_runner.cc
+++ b/components/test_runner/test_runner.cc
@@ -257,8 +257,9 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
void SetAlwaysAcceptCookies(bool accept);
void SetAudioData(const gin::ArrayBufferView& view);
void SetBackingScaleFactor(double value, v8::Local<v8::Function> callback);
- void SetBluetoothManualChooser();
- void SetBluetoothMockDataSet(const std::string& dataset_name);
+ void SetBluetoothFakeAdapter(const std::string& adapter_name,
+ v8::Local<v8::Function> callback);
+ void SetBluetoothManualChooser(bool enable);
void SetCanOpenWindows();
void SetCloseRemainingWindowsWhenComplete(gin::Arguments* args);
void SetColorProfile(const std::string& name,
@@ -574,13 +575,12 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
.SetMethod("setAudioData", &TestRunnerBindings::SetAudioData)
.SetMethod("setBackingScaleFactor",
&TestRunnerBindings::SetBackingScaleFactor)
-
+ .SetMethod("setBluetoothFakeAdapter",
Jeffrey Yasskin 2016/03/29 01:59:13 I think keep this below the link to the spec that'
ortuno 2016/03/29 16:05:16 Done.
+ &TestRunnerBindings::SetBluetoothFakeAdapter)
// The Bluetooth functions are specified at
// https://webbluetoothcg.github.io/web-bluetooth/tests/.
.SetMethod("setBluetoothManualChooser",
&TestRunnerBindings::SetBluetoothManualChooser)
- .SetMethod("setBluetoothMockDataSet",
- &TestRunnerBindings::SetBluetoothMockDataSet)
.SetMethod("setCallCloseOnWebViews", &TestRunnerBindings::NotImplemented)
.SetMethod("setCanOpenWindows", &TestRunnerBindings::SetCanOpenWindows)
.SetMethod("setCloseRemainingWindowsWhenComplete",
@@ -1380,14 +1380,16 @@ void TestRunnerBindings::SetColorProfile(
runner_->SetColorProfile(name, callback);
}
-void TestRunnerBindings::SetBluetoothMockDataSet(const std::string& name) {
+void TestRunnerBindings::SetBluetoothFakeAdapter(
+ const std::string& adapter_name,
+ v8::Local<v8::Function> callback) {
if (runner_)
- runner_->SetBluetoothMockDataSet(name);
+ runner_->SetBluetoothFakeAdapter(adapter_name, callback);
}
-void TestRunnerBindings::SetBluetoothManualChooser() {
+void TestRunnerBindings::SetBluetoothManualChooser(bool enable) {
if (runner_)
- runner_->SetBluetoothManualChooser();
+ runner_->SetBluetoothManualChooser(enable);
}
void TestRunnerBindings::GetBluetoothManualChooserEvents(
@@ -1726,7 +1728,7 @@ void TestRunner::Reset() {
delegate_->UseUnfortunateSynchronousResizeMode(false);
delegate_->DisableAutoResizeMode(WebSize());
delegate_->DeleteAllCookies();
- delegate_->SetBluetoothMockDataSet("");
+ delegate_->SetBluetoothManualChooser(false);
delegate_->ClearGeofencingMockProvider();
delegate_->ResetPermissions();
ResetDeviceLight();
@@ -2898,12 +2900,17 @@ void TestRunner::SetColorProfile(const std::string& name,
delegate_->PostTask(new InvokeCallbackTask(this, callback));
}
-void TestRunner::SetBluetoothMockDataSet(const std::string& name) {
- delegate_->SetBluetoothMockDataSet(name);
+void TestRunner::SetBluetoothFakeAdapter(const std::string& adapter_name,
+ v8::Local<v8::Function> callback) {
+ scoped_ptr<InvokeCallbackTask> task(new InvokeCallbackTask(this, callback));
+ delegate_->SetBluetoothFakeAdapter(
+ adapter_name,
+ base::Bind(&TestRunner::InvokeCallback, weak_factory_.GetWeakPtr(),
+ base::Passed(&task)));
}
-void TestRunner::SetBluetoothManualChooser() {
- delegate_->SetBluetoothManualChooser();
+void TestRunner::SetBluetoothManualChooser(bool enable) {
+ delegate_->SetBluetoothManualChooser(enable);
}
void TestRunner::GetBluetoothManualChooserEvents(

Powered by Google App Engine
This is Rietveld 408576698