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

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_cros_browser_test.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: iwyu fixes 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 chromeos::FakeSessionManagerClient* session_manager_client() { 72 chromeos::FakeSessionManagerClient* session_manager_client() {
73 return fake_session_manager_client_; 73 return fake_session_manager_client_;
74 } 74 }
75 75
76 DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); } 76 DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); }
77 77
78 private: 78 private:
79 DevicePolicyCrosTestHelper test_helper_; 79 DevicePolicyCrosTestHelper test_helper_;
80 80
81 // FakeDBusThreadManager uses FakeSessionManagerClient. 81 // FakeDBusThreadManager uses FakeSessionManagerClient.
82 scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_; 82 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter_;
83 chromeos::FakeSessionManagerClient* fake_session_manager_client_; 83 chromeos::FakeSessionManagerClient* fake_session_manager_client_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest); 85 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
86 }; 86 };
87 87
88 } // namespace policy 88 } // namespace policy
89 89
90 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 90 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698