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

Side by Side Diff: device/bluetooth/test/mock_bluetooth_device.cc

Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "device/bluetooth/test/mock_bluetooth_device.h" 5 #include "device/bluetooth/test/mock_bluetooth_device.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "device/bluetooth/test/mock_bluetooth_adapter.h" 8 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
9 9
10 namespace device { 10 namespace device {
11 11
12 MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter, 12 MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
13 uint32 bluetooth_class, 13 uint32 bluetooth_class,
14 const std::string& name, 14 const std::string& name,
15 const std::string& address, 15 const std::string& address,
16 bool paired, 16 bool paired,
17 bool connected) 17 bool connected)
(...skipping 22 matching lines...) Expand all
40 .WillByDefault(testing::Return(false)); 40 .WillByDefault(testing::Return(false));
41 ON_CALL(*this, ExpectingConfirmation()) 41 ON_CALL(*this, ExpectingConfirmation())
42 .WillByDefault(testing::Return(false)); 42 .WillByDefault(testing::Return(false));
43 ON_CALL(*this, GetServices()) 43 ON_CALL(*this, GetServices())
44 .WillByDefault(testing::Return(service_list_)); 44 .WillByDefault(testing::Return(service_list_));
45 } 45 }
46 46
47 MockBluetoothDevice::~MockBluetoothDevice() {} 47 MockBluetoothDevice::~MockBluetoothDevice() {}
48 48
49 } // namespace device 49 } // namespace device
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_experimental_chromeos_unittest.cc ('k') | extensions/common/error_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698