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

Side by Side Diff: chrome/browser/extensions/api/bluetooth/bluetooth_private_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, 5 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h" 8 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
9 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" 9 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 kDeviceName, 54 kDeviceName,
55 "11:12:13:14:15:16", 55 "11:12:13:14:15:16",
56 false, 56 false,
57 false)); 57 false));
58 ON_CALL(*mock_adapter_, GetDevice(mock_device_->GetAddress())) 58 ON_CALL(*mock_adapter_, GetDevice(mock_device_->GetAddress()))
59 .WillByDefault(Return(mock_device_.get())); 59 .WillByDefault(Return(mock_device_.get()));
60 ON_CALL(*mock_adapter_, IsPresent()) 60 ON_CALL(*mock_adapter_, IsPresent())
61 .WillByDefault(Return(true)); 61 .WillByDefault(Return(true));
62 } 62 }
63 63
64 virtual void CleanUpOnMainThread() OVERRIDE {} 64 virtual void TearDownOnMainThread() OVERRIDE {}
65 65
66 extensions::BluetoothEventRouter* event_router() { 66 extensions::BluetoothEventRouter* event_router() {
67 return extensions::BluetoothAPI::Get(browser()->profile()) 67 return extensions::BluetoothAPI::Get(browser()->profile())
68 ->event_router(); 68 ->event_router();
69 } 69 }
70 70
71 void SetName(const std::string& name, const base::Closure& callback) { 71 void SetName(const std::string& name, const base::Closure& callback) {
72 adapter_name_ = name; 72 adapter_name_ = name;
73 callback.Run(); 73 callback.Run();
74 } 74 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 EXPECT_CALL(*mock_adapter_, 176 EXPECT_CALL(*mock_adapter_,
177 AddPairingDelegate( 177 AddPairingDelegate(
178 _, device::BluetoothAdapter::PAIRING_DELEGATE_PRIORITY_HIGH)) 178 _, device::BluetoothAdapter::PAIRING_DELEGATE_PRIORITY_HIGH))
179 .WillOnce(WithoutArgs( 179 .WillOnce(WithoutArgs(
180 Invoke(this, &BluetoothPrivateApiTest::DispatchPasskeyPairingEvent))); 180 Invoke(this, &BluetoothPrivateApiTest::DispatchPasskeyPairingEvent)));
181 EXPECT_CALL(*mock_device_, ExpectingPasskey()).WillRepeatedly(Return(true)); 181 EXPECT_CALL(*mock_device_, ExpectingPasskey()).WillRepeatedly(Return(true));
182 EXPECT_CALL(*mock_device_, SetPasskey(900531)); 182 EXPECT_CALL(*mock_device_, SetPasskey(900531));
183 ASSERT_TRUE(RunComponentExtensionTest("bluetooth_private/passkey_pairing")) 183 ASSERT_TRUE(RunComponentExtensionTest("bluetooth_private/passkey_pairing"))
184 << message_; 184 << message_;
185 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698