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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.h

Issue 1865213004: Convert //chrome/browser/ui 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 14 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
15 #include "ui/base/ime/chromeos/input_method_descriptor.h" 15 #include "ui/base/ime/chromeos/input_method_descriptor.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 class MockInputMethodManagerWithInputMethods 19 class MockInputMethodManagerWithInputMethods
20 : public input_method::MockInputMethodManager { 20 : public input_method::MockInputMethodManager {
21 public: 21 public:
22 MockInputMethodManagerWithInputMethods(); 22 MockInputMethodManagerWithInputMethods();
23 ~MockInputMethodManagerWithInputMethods() override; 23 ~MockInputMethodManagerWithInputMethods() override;
24 24
25 // input_method::MockInputMethodManager: 25 // input_method::MockInputMethodManager:
26 scoped_ptr<input_method::InputMethodDescriptors> GetSupportedInputMethods() 26 std::unique_ptr<input_method::InputMethodDescriptors>
27 const override; 27 GetSupportedInputMethods() const override;
28 28
29 void AddInputMethod(const std::string& id, 29 void AddInputMethod(const std::string& id,
30 const std::string& raw_layout, 30 const std::string& raw_layout,
31 const std::string& language_code); 31 const std::string& language_code);
32 32
33 private: 33 private:
34 input_method::InputMethodDescriptors descriptors_; 34 input_method::InputMethodDescriptors descriptors_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(MockInputMethodManagerWithInputMethods); 36 DISALLOW_COPY_AND_ASSIGN(MockInputMethodManagerWithInputMethods);
37 }; 37 };
38 38
39 } // namespace chromeos 39 } // namespace chromeos
40 40
41 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_ 41 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_L10N_UTIL_TEST_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/l10n_util.cc ('k') | chrome/browser/ui/webui/chromeos/login/l10n_util_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698