Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1321)

Unified Diff: chrome/browser/extensions/api/serial/serial_apitest.cc

Issue 10919201: Make sure that a given app/extension requests only its own resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Improve tests; fix merge conflicts. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/serial/serial_apitest.cc
diff --git a/chrome/browser/extensions/api/serial/serial_apitest.cc b/chrome/browser/extensions/api/serial/serial_apitest.cc
index 0bd26abc24ce872408ecff0a3fac079de2c6aad1..2fbee49cb0964335569e90e745a6ef57cdf2426e 100644
--- a/chrome/browser/extensions/api/serial/serial_apitest.cc
+++ b/chrome/browser/extensions/api/serial/serial_apitest.cc
@@ -53,8 +53,9 @@ class FakeEchoSerialConnection : public SerialConnection {
explicit FakeEchoSerialConnection(
const std::string& port,
int bitrate,
+ const std::string& owner_extension_id,
ApiResourceEventNotifier* event_notifier)
- : SerialConnection(port, bitrate, event_notifier),
+ : SerialConnection(port, bitrate, owner_extension_id, event_notifier),
opened_(true) {
Flush();
opened_ = false;
@@ -119,9 +120,11 @@ class FakeSerialOpenFunction : public SerialOpenFunction {
virtual SerialConnection* CreateSerialConnection(
const std::string& port,
int bitrate,
+ const std::string& owner_extension_id,
ApiResourceEventNotifier* event_notifier) OVERRIDE {
FakeEchoSerialConnection* serial_connection =
- new FakeEchoSerialConnection(port, bitrate, event_notifier);
+ new FakeEchoSerialConnection(port, bitrate, owner_extension_id,
+ event_notifier);
EXPECT_CALL(*serial_connection, GetControlSignals(_)).
Times(1).WillOnce(Return(true));
EXPECT_CALL(*serial_connection, SetControlSignals(_)).
« no previous file with comments | « chrome/browser/extensions/api/serial/serial_api.cc ('k') | chrome/browser/extensions/api/serial/serial_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698