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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/web_ui_browser_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/usb_service/usb_service.h" 7 #include "components/usb_service/usb_service.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "content/public/test/test_utils.h" 9 #include "content/public/test/test_utils.h"
10 #include "extensions/browser/api/usb/usb_api.h" 10 #include "extensions/browser/api/usb/usb_api.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 FROM_HERE, 180 FROM_HERE,
181 base::Bind(&UsbApiTest::SetUpService, this), 181 base::Bind(&UsbApiTest::SetUpService, this),
182 runner->QuitClosure()); 182 runner->QuitClosure());
183 runner->Run(); 183 runner->Run();
184 } 184 }
185 185
186 void SetUpService() { 186 void SetUpService() {
187 UsbService::SetInstanceForTest(new MockUsbService(mock_device_)); 187 UsbService::SetInstanceForTest(new MockUsbService(mock_device_));
188 } 188 }
189 189
190 virtual void CleanUpOnMainThread() OVERRIDE { 190 virtual void TearDownOnMainThread() OVERRIDE {
191 scoped_refptr<content::MessageLoopRunner> runner = 191 scoped_refptr<content::MessageLoopRunner> runner =
192 new content::MessageLoopRunner; 192 new content::MessageLoopRunner;
193 UsbService* service = NULL; 193 UsbService* service = NULL;
194 BrowserThread::PostTaskAndReply( 194 BrowserThread::PostTaskAndReply(
195 BrowserThread::FILE, 195 BrowserThread::FILE,
196 FROM_HERE, 196 FROM_HERE,
197 base::Bind(&UsbService::SetInstanceForTest, service), 197 base::Bind(&UsbService::SetInstanceForTest, service),
198 runner->QuitClosure()); 198 runner->QuitClosure());
199 runner->Run(); 199 runner->Run();
200 } 200 }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 .WillOnce( 282 .WillOnce(
283 InvokeUsbTransferCallback<5>(usb_service::USB_TRANSFER_TIMEOUT)); 283 InvokeUsbTransferCallback<5>(usb_service::USB_TRANSFER_TIMEOUT));
284 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber()); 284 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
285 ASSERT_TRUE(RunExtensionTest("usb/transfer_failure")); 285 ASSERT_TRUE(RunExtensionTest("usb/transfer_failure"));
286 } 286 }
287 287
288 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) { 288 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
289 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber()); 289 EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
290 ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer")); 290 ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
291 } 291 }
OLDNEW
« no previous file with comments | « chrome/test/base/web_ui_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698