summaryrefslogtreecommitdiffstats
path: root/extensions/renderer/api
diff options
context:
space:
mode:
authorsammc <sammc@chromium.org>2014-10-27 18:07:00 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 01:07:20 +0000
commitd9fddbc5700ebdea8d4643b4d2c2f6f76abd4b30 (patch)
tree46a8eaccc24ab175fee854a90b62e44b5708819a /extensions/renderer/api
parent42a54f5f7d5da2ea5ccc1d0ffda4a18ea2314ae8 (diff)
downloadchromium_src-d9fddbc5700ebdea8d4643b4d2c2f6f76abd4b30.zip
chromium_src-d9fddbc5700ebdea8d4643b4d2c2f6f76abd4b30.tar.gz
chromium_src-d9fddbc5700ebdea8d4643b4d2c2f6f76abd4b30.tar.bz2
Add an extensions keep-alive client.
This adds the renderer side of adding keep-alives while API calls implemented on mojo services are in progress. BUG=389016 Review URL: https://codereview.chromium.org/669303002 Cr-Commit-Position: refs/heads/master@{#301528}
Diffstat (limited to 'extensions/renderer/api')
-rw-r--r--extensions/renderer/api/serial/serial_api_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/renderer/api/serial/serial_api_unittest.cc b/extensions/renderer/api/serial/serial_api_unittest.cc
index 31362eb..a01c69f 100644
--- a/extensions/renderer/api/serial/serial_api_unittest.cc
+++ b/extensions/renderer/api/serial/serial_api_unittest.cc
@@ -5,6 +5,7 @@
#include "device/serial/serial_device_enumerator.h"
#include "device/serial/serial_service_impl.h"
#include "device/serial/test_serial_io_handler.h"
+#include "extensions/common/mojo/keep_alive.mojom.h"
#include "extensions/renderer/api_test_base.h"
#include "grit/extensions_renderer_resources.h"
@@ -410,6 +411,7 @@ class SerialApiTest : public ApiTestBase {
IDR_SERIAL_SERIALIZATION_MOJOM_JS);
service_provider()->AddService<device::serial::SerialService>(base::Bind(
&SerialApiTest::CreateSerialService, base::Unretained(this)));
+ service_provider()->IgnoreServiceRequests<KeepAlive>();
}
scoped_refptr<TestIoHandlerBase> io_handler_;