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

Unified Diff: chrome/browser/extensions/api/usb/usb_apitest.cc

Issue 12494028: Move Requirements out of Extension Class (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 9 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/usb/usb_apitest.cc
diff --git a/chrome/browser/extensions/api/usb/usb_apitest.cc b/chrome/browser/extensions/api/usb/usb_apitest.cc
index 18ed3dd1919aba5a34d6b787dc764c6016c0d5b7..2539cf1d4fba1dd54848c2f2faae95c62d918cbe 100644
--- a/chrome/browser/extensions/api/usb/usb_apitest.cc
+++ b/chrome/browser/extensions/api/usb/usb_apitest.cc
@@ -14,6 +14,8 @@
using testing::AnyNumber;
using testing::_;
+namespace extensions {
+
namespace {
ACTION_TEMPLATE(InvokeUsbTransferCallback,
@@ -69,8 +71,9 @@ class UsbApiTest : public ExtensionApiTest {
}
virtual void SetUpOnMainThread() OVERRIDE {
+ ExtensionApiTest::SetUpOnMainThread();
mock_device_ = new MockUsbDevice();
- extensions::UsbFindDevicesFunction::SetDeviceForTest(mock_device_.get());
+ UsbFindDevicesFunction::SetDeviceForTest(mock_device_.get());
}
protected:
@@ -123,3 +126,4 @@ IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
}
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698