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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_test_helper.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 (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 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 18 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
19 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 19 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
20 #include "chrome/browser/chromeos/policy/device_policy_builder.h" 20 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
21 #include "chrome/browser/chromeos/settings/device_settings_service.h" 21 #include "chrome/browser/chromeos/settings/device_settings_service.h"
22 #include "chromeos/dbus/session_manager_client.h" 22 #include "chromeos/dbus/session_manager_client.h"
23 #include "components/ownership/mock_owner_key_util.h" 23 #include "components/ownership/mock_owner_key_util.h"
24 #include "content/public/test/test_browser_thread_bundle.h" 24 #include "content/public/test/test_browser_thread_bundle.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 DeviceSettingsTestHelper device_settings_test_helper_; 184 DeviceSettingsTestHelper device_settings_test_helper_;
185 // Note that FakeUserManager is used by ProfileHelper, which some of the 185 // Note that FakeUserManager is used by ProfileHelper, which some of the
186 // tested classes depend on implicitly. 186 // tested classes depend on implicitly.
187 FakeChromeUserManager* user_manager_; 187 FakeChromeUserManager* user_manager_;
188 ScopedUserManagerEnabler user_manager_enabler_; 188 ScopedUserManagerEnabler user_manager_enabler_;
189 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_; 189 scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
190 // Local DeviceSettingsService instance for tests. Avoid using in combination 190 // Local DeviceSettingsService instance for tests. Avoid using in combination
191 // with the global instance (DeviceSettingsService::Get()). 191 // with the global instance (DeviceSettingsService::Get()).
192 DeviceSettingsService device_settings_service_; 192 DeviceSettingsService device_settings_service_;
193 scoped_ptr<TestingProfile> profile_; 193 std::unique_ptr<TestingProfile> profile_;
194 194
195 scoped_ptr<DBusThreadManagerSetter> dbus_setter_; 195 std::unique_ptr<DBusThreadManagerSetter> dbus_setter_;
196 196
197 private: 197 private:
198 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase); 198 DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
199 }; 199 };
200 200
201 } // namespace chromeos 201 } // namespace chromeos
202 202
203 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_ 203 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698