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

Side by Side Diff: chrome/browser/extensions/api/image_writer_private/test_utils.cc

Issue 1556783002: Convert Pass()→std::move() for CrOS extension code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/api/image_writer_private/test_utils.h" 5 #include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <utility>
8 9
9 #include "build/build_config.h" 10 #include "build/build_config.h"
10 11
11 #if defined(OS_CHROMEOS) 12 #if defined(OS_CHROMEOS)
12 #include "chromeos/dbus/dbus_thread_manager.h" 13 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/dbus/fake_image_burner_client.h" 14 #include "chromeos/dbus/fake_image_burner_client.h"
14 #endif 15 #endif
15 16
16 namespace extensions { 17 namespace extensions {
17 namespace image_writer { 18 namespace image_writer {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 162
162 ASSERT_TRUE(FillFile(test_image_path_, kImagePattern, kTestFileSize)); 163 ASSERT_TRUE(FillFile(test_image_path_, kImagePattern, kTestFileSize));
163 ASSERT_TRUE(FillFile(test_device_path_, kDevicePattern, kTestFileSize)); 164 ASSERT_TRUE(FillFile(test_device_path_, kDevicePattern, kTestFileSize));
164 165
165 #if defined(OS_CHROMEOS) 166 #if defined(OS_CHROMEOS)
166 if (!chromeos::DBusThreadManager::IsInitialized()) { 167 if (!chromeos::DBusThreadManager::IsInitialized()) {
167 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = 168 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
168 chromeos::DBusThreadManager::GetSetterForTesting(); 169 chromeos::DBusThreadManager::GetSetterForTesting();
169 scoped_ptr<chromeos::ImageBurnerClient> 170 scoped_ptr<chromeos::ImageBurnerClient>
170 image_burner_fake(new ImageWriterFakeImageBurnerClient()); 171 image_burner_fake(new ImageWriterFakeImageBurnerClient());
171 dbus_setter->SetImageBurnerClient(image_burner_fake.Pass()); 172 dbus_setter->SetImageBurnerClient(std::move(image_burner_fake));
172 } 173 }
173 174
174 FakeDiskMountManager* disk_manager = new FakeDiskMountManager(); 175 FakeDiskMountManager* disk_manager = new FakeDiskMountManager();
175 chromeos::disks::DiskMountManager::InitializeForTesting(disk_manager); 176 chromeos::disks::DiskMountManager::InitializeForTesting(disk_manager);
176 177
177 // Adds a disk entry for test_device_path_ with the same device and file path. 178 // Adds a disk entry for test_device_path_ with the same device and file path.
178 disk_manager->CreateDiskEntryForMountDevice( 179 disk_manager->CreateDiskEntryForMountDevice(
179 chromeos::disks::DiskMountManager::MountPointInfo( 180 chromeos::disks::DiskMountManager::MountPointInfo(
180 test_device_path_.value(), 181 test_device_path_.value(),
181 "/dummy/mount", 182 "/dummy/mount",
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 test_utils_.SetUp(); 268 test_utils_.SetUp();
268 } 269 }
269 270
270 void ImageWriterUnitTestBase::TearDown() { 271 void ImageWriterUnitTestBase::TearDown() {
271 testing::Test::TearDown(); 272 testing::Test::TearDown();
272 test_utils_.TearDown(); 273 test_utils_.TearDown();
273 } 274 }
274 275
275 } // namespace image_writer 276 } // namespace image_writer
276 } // namespace extensions 277 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698