summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/api
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2014-10-28 00:04:30 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 07:04:57 +0000
commitf43db66685654de91010ee4feda62d7b7880d4b4 (patch)
tree2fc6f730313289ab52ec0c6bdff741f200f856c3 /extensions/renderer/api
parent0dfe9ba256030d15cc897295c3fa3bdd5d564404 (diff)
downloadchromium_src-f43db66685654de91010ee4feda62d7b7880d4b4.zip
chromium_src-f43db66685654de91010ee4feda62d7b7880d4b4.tar.gz
chromium_src-f43db66685654de91010ee4feda62d7b7880d4b4.tar.bz2
Change data pipe wrappers used by SerialConnection to use message pipe.
Interprocess mojo data pipe is not ready yet. This converts the data pipe wrappers to send the data via their control message pipes until interprocess data pipe is ready. BUG=389016 Review URL: https://codereview.chromium.org/646063003 Cr-Commit-Position: refs/heads/master@{#301582}
Diffstat (limited to 'extensions/renderer/api')
-rw-r--r--extensions/renderer/api/serial/data_receiver_unittest.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/extensions/renderer/api/serial/data_receiver_unittest.cc b/extensions/renderer/api/serial/data_receiver_unittest.cc
index 381e361..7e6df3b 100644
--- a/extensions/renderer/api/serial/data_receiver_unittest.cc
+++ b/extensions/renderer/api/serial/data_receiver_unittest.cc
@@ -63,11 +63,6 @@ class DataReceiverTest : public ApiTestBase {
error = error_to_send_.front();
error_to_send_.pop();
}
- if (error == 2) {
- sender_->ShutDown();
- sender_ = NULL;
- return;
- }
DCHECK(buffer->GetSize() >= static_cast<uint32_t>(data.size()));
memcpy(buffer->GetData(), data.c_str(), data.size());
if (error)
@@ -136,9 +131,4 @@ TEST_F(DataReceiverTest, SerializeAfterClose) {
RunTest("data_receiver_unittest.js", "testSerializeAfterClose");
}
-TEST_F(DataReceiverTest, SourceShutdown) {
- error_to_send_.push(2);
- RunTest("data_receiver_unittest.js", "testSourceShutdown");
-}
-
} // namespace extensions