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

Side by Side Diff: extensions/browser/api/usb/usb_apitest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "content/public/browser/browser_thread.h" 7 #include "content/public/browser/browser_thread.h"
8 #include "content/public/test/test_utils.h" 8 #include "content/public/test/test_utils.h"
9 #include "device/usb/usb_service.h" 9 #include "device/usb/usb_service.h"
10 #include "extensions/browser/api/usb/usb_api.h" 10 #include "extensions/browser/api/usb/usb_api.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 runner->Run(); 176 runner->Run();
177 } 177 }
178 178
179 void SetUpService() { 179 void SetUpService() {
180 UsbService::SetInstanceForTest(new MockUsbService(mock_device_)); 180 UsbService::SetInstanceForTest(new MockUsbService(mock_device_));
181 } 181 }
182 182
183 virtual void TearDownOnMainThread() OVERRIDE { 183 virtual void TearDownOnMainThread() OVERRIDE {
184 scoped_refptr<content::MessageLoopRunner> runner = 184 scoped_refptr<content::MessageLoopRunner> runner =
185 new content::MessageLoopRunner; 185 new content::MessageLoopRunner;
186 UsbService* service = NULL; 186 UsbService* service = nullptr;
187 BrowserThread::PostTaskAndReply( 187 BrowserThread::PostTaskAndReply(
188 BrowserThread::FILE, 188 BrowserThread::FILE,
189 FROM_HERE, 189 FROM_HERE,
190 base::Bind(&UsbService::SetInstanceForTest, service), 190 base::Bind(&UsbService::SetInstanceForTest, service),
191 runner->QuitClosure()); 191 runner->QuitClosure());
192 runner->Run(); 192 runner->Run();
193 } 193 }
194 194
195 protected: 195 protected:
196 scoped_refptr<MockUsbDeviceHandle> mock_device_handle_; 196 scoped_refptr<MockUsbDeviceHandle> mock_device_handle_;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_ERROR)) 263 .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_ERROR))
264 .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_TIMEOUT)); 264 .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_TIMEOUT));
265 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber()); 265 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
266 ASSERT_TRUE(RunExtensionTest("usb/transfer_failure")); 266 ASSERT_TRUE(RunExtensionTest("usb/transfer_failure"));
267 } 267 }
268 268
269 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) { 269 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
270 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber()); 270 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
271 ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer")); 271 ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
272 } 272 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698