summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/api
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2014-10-03 19:20:30 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-04 02:20:53 +0000
commit3c853bb5b1cbe849fa87539a13402ccaa4caae95 (patch)
tree4ca9ab6edaee761226ee93e5fef6964541813f42 /extensions/renderer/api
parent2edccc132ff8b341400d920c943d7c853af228cc (diff)
downloadchromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.zip
chromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.tar.gz
chromium_src-3c853bb5b1cbe849fa87539a13402ccaa4caae95.tar.bz2
Revert of Add serialization support to the JS serial connection client. (patchset #5 id:180001 of https://codereview.chromium.org/592263004/)
Reason for revert: Broke compile on GPU Mac Builder. Original issue's description: > Add serialization support to the JS serial connection client. > > To support persistent serial connections on mojo, serial.Connection and > its dependencies must be serializable to mojo structs so it can be > stashed. This adds serialization support to serial.Connection. > > BUG=389016 > > Committed: https://crrev.com/3daad1ed89cd32023624be98edaf051a0043ff5f > Cr-Commit-Position: refs/heads/master@{#298158} TBR=raymes@chromium.org,rockot@chromium.org NOTREECHECKS=true NOTRY=true BUG=389016 Review URL: https://codereview.chromium.org/627123002 Cr-Commit-Position: refs/heads/master@{#298161}
Diffstat (limited to 'extensions/renderer/api')
-rw-r--r--extensions/renderer/api/serial/serial_api_unittest.cc25
1 files changed, 0 insertions, 25 deletions
diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc
index bc60b7d..bf14bf3 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -407,8 +407,6 @@ class SerialApiTest : public ApiTestBase {
env()->RegisterModule("device/serial/data_stream_serialization.mojom",
IDR_DATA_STREAM_SERIALIZATION_MOJOM_JS);
env()->RegisterModule("device/serial/serial.mojom", IDR_SERIAL_MOJOM_JS);
- env()->RegisterModule("device/serial/serial_serialization.mojom",
- IDR_SERIAL_SERIALIZATION_MOJOM_JS);
service_provider()->AddService<device::serial::SerialService>(base::Bind(
&SerialApiTest::CreateSerialService, base::Unretained(this)));
}
@@ -467,10 +465,6 @@ TEST_F(SerialApiTest, GetInfo) {
RunTest("serial_unittest.js", "testGetInfo");
}
-TEST_F(SerialApiTest, GetInfoAfterSerialization) {
- RunTest("serial_unittest.js", "testGetInfoAfterSerialization");
-}
-
TEST_F(SerialApiTest, GetInfoFailToGetPortInfo) {
io_handler_ = new FailToGetInfoTestIoHandler(1);
RunTest("serial_unittest.js", "testGetInfoFailToGetPortInfo");
@@ -498,12 +492,6 @@ TEST_F(SerialApiTest, Update) {
EXPECT_EQ(11u, io_handler_->num_calls());
}
-TEST_F(SerialApiTest, UpdateAcrossSerialization) {
- io_handler_ = new ConfigurePortTestIoHandler;
- RunTest("serial_unittest.js", "testUpdateAcrossSerialization");
- EXPECT_EQ(11u, io_handler_->num_calls());
-}
-
TEST_F(SerialApiTest, UpdateInvalidBitrate) {
io_handler_ = new ConfigurePortTestIoHandler;
RunTest("serial_unittest.js", "testUpdateInvalidBitrate");
@@ -524,10 +512,6 @@ TEST_F(SerialApiTest, Echo) {
RunTest("serial_unittest.js", "testEcho");
}
-TEST_F(SerialApiTest, EchoAfterSerialization) {
- RunTest("serial_unittest.js", "testEchoAfterSerialization");
-}
-
TEST_F(SerialApiTest, SendDuringExistingSend) {
RunTest("serial_unittest.js", "testSendDuringExistingSend");
}
@@ -546,11 +530,6 @@ TEST_F(SerialApiTest, SendTimeout) {
RunTest("serial_unittest.js", "testSendTimeout");
}
-TEST_F(SerialApiTest, SendTimeoutAfterSerialization) {
- io_handler_ = new BlockSendsForeverSendIoHandler();
- RunTest("serial_unittest.js", "testSendTimeoutAfterSerialization");
-}
-
TEST_F(SerialApiTest, DisableSendTimeout) {
io_handler_ = new BlockSendsForeverSendIoHandler();
RunTest("serial_unittest.js", "testDisableSendTimeout");
@@ -571,10 +550,6 @@ TEST_F(SerialApiTest, ReceiveTimeout) {
RunTest("serial_unittest.js", "testReceiveTimeout");
}
-TEST_F(SerialApiTest, ReceiveTimeoutAfterSerialization) {
- RunTest("serial_unittest.js", "testReceiveTimeoutAfterSerialization");
-}
-
TEST_F(SerialApiTest, DisableReceiveTimeout) {
RunTest("serial_unittest.js", "testDisableReceiveTimeout");
}