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

Side by Side Diff: chrome/browser/chromeos/policy/user_policy_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_USER_POLICY_TEST_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 13
14 class Profile; 14 class Profile;
15 15
16 namespace base { 16 namespace base {
17 class CommandLine; 17 class CommandLine;
18 class FilePath; 18 class FilePath;
19 class DictionaryValue; 19 class DictionaryValue;
20 } 20 }
21 21
22 namespace policy { 22 namespace policy {
(...skipping 28 matching lines...) Expand all
51 51
52 void DeletePolicyFile(); 52 void DeletePolicyFile();
53 53
54 private: 54 private:
55 void WritePolicyFile(const base::DictionaryValue& mandatory, 55 void WritePolicyFile(const base::DictionaryValue& mandatory,
56 const base::DictionaryValue& recommended); 56 const base::DictionaryValue& recommended);
57 base::FilePath PolicyFilePath() const; 57 base::FilePath PolicyFilePath() const;
58 58
59 const std::string account_id_; 59 const std::string account_id_;
60 base::ScopedTempDir temp_dir_; 60 base::ScopedTempDir temp_dir_;
61 scoped_ptr<LocalPolicyTestServer> test_server_; 61 std::unique_ptr<LocalPolicyTestServer> test_server_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(UserPolicyTestHelper); 63 DISALLOW_COPY_AND_ASSIGN(UserPolicyTestHelper);
64 }; 64 };
65 65
66 } // namespace policy 66 } // namespace policy
67 67
68 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_ 68 #endif // CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698