DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

chrome/browser/devtools/device/adb/mock_adb_server.cc

Index: chrome/browser/devtools/device/adb/mock_adb_server.cc
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
index b116f84cd5e93595987965828e4869cef2e23912..61a0bdab98e8f87bde7f40f25475095e58a667be 100644
--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
@@ -471,7 +471,7 @@ class MockAdbServer : SingleConnectionServer::Parser,
       selected_device_ = command.substr(strlen(kHostTransportPrefix));
       SendResponse("");
     } else if (selected_device_ != kSerialOnline) {
-      NOTREACHED() << "Unknown device - " << selected_device_;
+      Send("FAIL", "device offline (x)");
     } else if (command == kDeviceModelCommand) {
       SendResponse(kDeviceModel);
     } else if (command == kOpenedUnixSocketsCommand) {
@@ -490,10 +490,14 @@ class MockAdbServer : SingleConnectionServer::Parser,
     }
   }
 
-  void SendResponse(const std::string& response) {
+  void SendResponse(const std::string& response) { Send("OKAY", response); }
+
+  void Send(const std::string& status, const std::string& response) {
     CHECK(CalledOnValidThread());
+    CHECK_EQ(4U, status.size());
+
     std::stringstream response_stream;
-    response_stream << "OKAY";
+    response_stream << status;
 
     int size = response.size();
     if (size > 0) {