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

Side by Side Diff: ui/base/ime/chromeos/component_extension_ime_manager_unittest.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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
« no previous file with comments | « sandbox/win/src/target_process.cc ('k') | ui/gfx/icon_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/base/ime/chromeos/component_extension_ime_manager.h" 10 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 ext3_engine3.display_name = "ext3_engine3_display_name"; 107 ext3_engine3.display_name = "ext3_engine3_display_name";
108 ext3_engine3.language_codes.push_back("en"); 108 ext3_engine3.language_codes.push_back("en");
109 ext3_engine3.layouts.push_back("us"); 109 ext3_engine3.layouts.push_back("us");
110 ext3.engines.push_back(ext3_engine3); 110 ext3.engines.push_back(ext3_engine3);
111 111
112 ime_list_.push_back(ext3); 112 ime_list_.push_back(ext3);
113 113
114 mock_delegate_ = new MockComponentExtIMEManagerDelegate(); 114 mock_delegate_ = new MockComponentExtIMEManagerDelegate();
115 mock_delegate_->set_ime_list(ime_list_); 115 mock_delegate_->set_ime_list(ime_list_);
116 component_ext_mgr_.reset(new ComponentExtensionIMEManager()); 116 component_ext_mgr_.reset(new ComponentExtensionIMEManager());
117 component_ext_mgr_->Initialize( 117 component_ext_mgr_->Initialize(make_scoped_ptr(mock_delegate_));
118 scoped_ptr<ComponentExtensionIMEManagerDelegate>(
119 mock_delegate_).Pass());
120 } 118 }
121 119
122 virtual void TearDown() { 120 virtual void TearDown() {
123 } 121 }
124 122
125 protected: 123 protected:
126 MockComponentExtIMEManagerDelegate* mock_delegate_; 124 MockComponentExtIMEManagerDelegate* mock_delegate_;
127 scoped_ptr<ComponentExtensionIMEManager> component_ext_mgr_; 125 scoped_ptr<ComponentExtensionIMEManager> component_ext_mgr_;
128 std::vector<ComponentExtensionIME> ime_list_; 126 std::vector<ComponentExtensionIME> ime_list_;
129 127
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } else if (i >= 2 && i < 4) { 201 } else if (i >= 2 && i < 4) {
204 EXPECT_TRUE(d.id().find("vkd_") != std::string::npos); 202 EXPECT_TRUE(d.id().find("vkd_") != std::string::npos);
205 } 203 }
206 } 204 }
207 } 205 }
208 206
209 } // namespace 207 } // namespace
210 208
211 } // namespace input_method 209 } // namespace input_method
212 } // namespace chromeos 210 } // namespace chromeos
OLDNEW
« no previous file with comments | « sandbox/win/src/target_process.cc ('k') | ui/gfx/icon_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698