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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

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 (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 #include "components/toolbar/toolbar_model.h" 5 #include "components/toolbar/toolbar_model.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void SetUp() override; 153 void SetUp() override;
154 154
155 protected: 155 protected:
156 void NavigateAndCheckText(const GURL& url, 156 void NavigateAndCheckText(const GURL& url,
157 const base::string16& expected_text, 157 const base::string16& expected_text,
158 bool would_perform_search_term_replacement, 158 bool would_perform_search_term_replacement,
159 bool should_display_url); 159 bool should_display_url);
160 void NavigateAndCheckElided(const GURL& https_url); 160 void NavigateAndCheckElided(const GURL& https_url);
161 161
162 private: 162 private:
163 scoped_ptr<base::FieldTrialList> field_trial_list_; 163 std::unique_ptr<base::FieldTrialList> field_trial_list_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(ToolbarModelTest); 165 DISALLOW_COPY_AND_ASSIGN(ToolbarModelTest);
166 }; 166 };
167 167
168 ToolbarModelTest::ToolbarModelTest() { 168 ToolbarModelTest::ToolbarModelTest() {
169 } 169 }
170 170
171 ToolbarModelTest::ToolbarModelTest(Browser::Type browser_type, bool hosted_app) 171 ToolbarModelTest::ToolbarModelTest(Browser::Type browser_type, bool hosted_app)
172 : BrowserWithTestWindowTest(browser_type, hosted_app) {} 172 : BrowserWithTestWindowTest(browser_type, hosted_app) {}
173 173
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 389
390 // Disabling URL replacement should reset to only showing URLs. 390 // Disabling URL replacement should reset to only showing URLs.
391 browser()->toolbar_model()->set_url_replacement_enabled(false); 391 browser()->toolbar_model()->set_url_replacement_enabled(false);
392 for (size_t i = 0; i < arraysize(test_items); ++i) { 392 for (size_t i = 0; i < arraysize(test_items); ++i) {
393 const TestItem& test_item = test_items[i]; 393 const TestItem& test_item = test_items[i];
394 NavigateAndCheckText(test_item.url, 394 NavigateAndCheckText(test_item.url,
395 test_item.expected_text_url_replacement_inactive, 395 test_item.expected_text_url_replacement_inactive,
396 false, test_item.should_display_url); 396 false, test_item.should_display_url);
397 } 397 }
398 } 398 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc ('k') | chrome/browser/ui/translate/language_combobox_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698