bluetooth: Improve GATT disconnected error message.

bluetooth: Improve GATT disconnected error message.

BluetoothRemoteGATTServer.cpp:
Suggest corrective action of calling gatt.connect when an operation
fails due to being disconnected.

Also, reduce required number of strings by merging two similar
error messages given a disconnected state. It doesn't matter
if the device was already disconnected or became disconnected
after an operation has already started. In both cases the
action that must be taken is to connect again.

generate.py:
Generated layout tests must now deal with 'git cl format' causing
template .js files to have line breaks. The regular expression
is updated to accomodate this.

BUG=684445
Review-Url: https://codereview.chromium.org/2652163002
Cr-Commit-Position: refs/heads/master@{#446895}
Committed: https://chromium.googlesource.com/chromium/src/+/1e43caf1c8478ce34a810418b55ddb244a29248b

[scheib, 2017-01-25 06:00:53]

scheib@chromium.org changed reviewers:
+ ortuno@chromium.org

[scheib, 2017-01-25 06:01:36]

The CQ bit was checked by scheib@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-25 06:02:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-25 07:58:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-25 07:58:43]

Dry run: This issue passed the CQ dry run.

[ortuno, 2017-01-26 21:28:36]

this lgtm. Are you planning on submitting patches for the service and
characteristic strings?
https://cs.chromium.org/search/?q=kgattservernotconnected&sq=package:chromium...

[scheib, 2017-01-26 23:04:11]

On 2017/01/26 21:28:36, ortuno wrote:
> this lgtm. Are you planning on submitting patches for the service and
> characteristic strings?
>
https://cs.chromium.org/search/?q=kgattservernotconnected&sq=package:chromium...

I am now. ;) I hadn't noticed them.

[scheib, 2017-01-26 23:04:23]

The CQ bit was checked by scheib@chromium.org

[commit-bot: I haz the power, 2017-01-26 23:05:09]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-27 00:37:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-27 00:37:51]

Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[scheib, 2017-01-27 07:00:36]

The CQ bit was checked by scheib@chromium.org

[commit-bot: I haz the power, 2017-01-27 07:00:53]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-27 08:04:10]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-27 08:04:13]

Failed to apply patch for
third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp:
While running git apply --index -p1;
  error: patch failed:
third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp:110
  error:
third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp: patch
does not apply

Patch:      
third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
Index: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
diff --git
a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
index
853418168d8a1e2055ce9ec581cb9e3d331b5654..7e9364983d3e23d6cc1af90babbfe7c5336706fb
100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
@@ -21,10 +21,9 @@ namespace blink {
 
 namespace {
 
-const char kGATTServerDisconnected[] =
-    "GATT Server disconnected while retrieving services.";
 const char kGATTServerNotConnected[] =
-    "GATT Server is disconnected. Cannot retrieve services.";
+    "GATT Server is disconnected. Cannot retrieve services. (Re)connect first "
+    "with `device.gatt.connect`.";
 
 }  // namespace
 
@@ -110,7 +109,7 @@ void BluetoothRemoteGATTServer::GetPrimaryServicesCallback(
   // disconnected so we reject.
   if (!RemoveFromActiveAlgorithms(resolver)) {
     resolver->reject(
-        DOMException::create(NetworkError, kGATTServerDisconnected));
+        DOMException::create(NetworkError, kGATTServerNotConnected));
     return;
   }

[scheib, 2017-01-28 01:29:58]

The CQ bit was checked by scheib@chromium.org

[scheib, 2017-01-28 01:29:58]

The patchset sent to the CQ was uploaded after l-g-t-m from ortuno@chromium.org
Link to the patchset: https://codereview.chromium.org/2652163002/#ps20001
(title: "Merge TOT")

[commit-bot: I haz the power, 2017-01-28 01:30:23]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-28 03:14:01]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1485566998236900,
"parent_rev": "1870af92713b4c2eefd45312b7cf9c5c18477f59", "commit_rev":
"1e43caf1c8478ce34a810418b55ddb244a29248b"}

[commit-bot: I haz the power, 2017-01-28 03:14:33]

Description was changed from

==========
bluetooth: Improve GATT disconnected error message.

BluetoothRemoteGATTServer.cpp:
Suggest corrective action of calling gatt.connect when an operation
fails due to being disconnected.

Also, reduce required number of strings by merging two similar
error messages given a disconnected state. It doesn't matter
if the device was already disconnected or became disconnected
after an operation has already started. In both cases the
action that must be taken is to connect again.

generate.py:
Generated layout tests must now deal with 'git cl format' causing
template .js files to have line breaks. The regular expression
is updated to accomodate this.

BUG=684445
==========

to

==========
bluetooth: Improve GATT disconnected error message.

BluetoothRemoteGATTServer.cpp:
Suggest corrective action of calling gatt.connect when an operation
fails due to being disconnected.

Also, reduce required number of strings by merging two similar
error messages given a disconnected state. It doesn't matter
if the device was already disconnected or became disconnected
after an operation has already started. In both cases the
action that must be taken is to connect again.

generate.py:
Generated layout tests must now deal with 'git cl format' causing
template .js files to have line breaks. The regular expression
is updated to accomodate this.

BUG=684445

Review-Url: https://codereview.chromium.org/2652163002
Cr-Commit-Position: refs/heads/master@{#446895}
Committed:
https://chromium.googlesource.com/chromium/src/+/1e43caf1c8478ce34a810418b55d...
==========

[commit-bot: I haz the power, 2017-01-28 03:14:34]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/1e43caf1c8478ce34a810418b55d...

[scheib, 2017-01-28 16:13:52]

scheib@chromium.org changed reviewers:
+ stevenjb@chromium.org

[scheib, 2017-01-28 16:15:01]

On 2017/01/28 16:13:53, scheib wrote:

Sorry, wrong issue, ignore this one.

[scheib, 2017-01-28 16:15:31]

Description was changed from

==========
bluetooth: Improve GATT disconnected error message.

BluetoothRemoteGATTServer.cpp:
Suggest corrective action of calling gatt.connect when an operation
fails due to being disconnected.

Also, reduce required number of strings by merging two similar
error messages given a disconnected state. It doesn't matter
if the device was already disconnected or became disconnected
after an operation has already started. In both cases the
action that must be taken is to connect again.

generate.py:
Generated layout tests must now deal with 'git cl format' causing
template .js files to have line breaks. The regular expression
is updated to accomodate this.

BUG=684445

Review-Url: https://codereview.chromium.org/2652163002
Cr-Commit-Position: refs/heads/master@{#446895}
Committed:
https://chromium.googlesource.com/chromium/src/+/1e43caf1c8478ce34a810418b55d...
==========

to

==========
bluetooth: Improve GATT disconnected error message.

BluetoothRemoteGATTServer.cpp:
Suggest corrective action of calling gatt.connect when an operation
fails due to being disconnected.

Also, reduce required number of strings by merging two similar
error messages given a disconnected state. It doesn't matter
if the device was already disconnected or became disconnected
after an operation has already started. In both cases the
action that must be taken is to connect again.

generate.py:
Generated layout tests must now deal with 'git cl format' causing
template .js files to have line breaks. The regular expression
is updated to accomodate this.

BUG=684445

Review-Url: https://codereview.chromium.org/2652163002
Cr-Commit-Position: refs/heads/master@{#446895}
Committed:
https://chromium.googlesource.com/chromium/src/+/1e43caf1c8478ce34a810418b55d...
==========

[scheib, 2017-01-28 16:15:31]

scheib@chromium.org changed reviewers:
- stevenjb@chromium.org