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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stddef.h> 5 #include <stddef.h>
6 #include <stdio.h> 6 #include <stdio.h>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/scoped_observer.h" 10 #include "base/scoped_observer.h"
(...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 ASSERT_NO_FATAL_FAILURE( 1599 ASSERT_NO_FATAL_FAILURE(
1600 SendKey(ui::VKEY_V, kCtrlOrCmdMask | ui::EF_ALT_DOWN)); 1600 SendKey(ui::VKEY_V, kCtrlOrCmdMask | ui::EF_ALT_DOWN));
1601 EXPECT_EQ(ASCIIToUTF16("ab123cd"), omnibox_view->GetText()); 1601 EXPECT_EQ(ASCIIToUTF16("ab123cd"), omnibox_view->GetText());
1602 // TODO(msw): Test that AltGr+V does not paste. 1602 // TODO(msw): Test that AltGr+V does not paste.
1603 } 1603 }
1604 1604
1605 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) { 1605 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) {
1606 // Set permanent text thus making sure that omnibox treats 'google.com' 1606 // Set permanent text thus making sure that omnibox treats 'google.com'
1607 // as URL (not as ordinary user input). 1607 // as URL (not as ordinary user input).
1608 TestToolbarModel* test_toolbar_model = new TestToolbarModel; 1608 TestToolbarModel* test_toolbar_model = new TestToolbarModel;
1609 scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model); 1609 std::unique_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
1610 test_toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/")); 1610 test_toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/"));
1611 browser()->swap_toolbar_models(&toolbar_model); 1611 browser()->swap_toolbar_models(&toolbar_model);
1612 OmniboxView* omnibox_view = NULL; 1612 OmniboxView* omnibox_view = NULL;
1613 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); 1613 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
1614 OmniboxEditModel* edit_model = omnibox_view->model(); 1614 OmniboxEditModel* edit_model = omnibox_view->model();
1615 ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model); 1615 ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
1616 edit_model->UpdatePermanentText(); 1616 edit_model->UpdatePermanentText();
1617 1617
1618 const char* target_url = "http://www.google.com/calendar"; 1618 const char* target_url = "http://www.google.com/calendar";
1619 omnibox_view->SetUserText(ASCIIToUTF16(target_url)); 1619 omnibox_view->SetUserText(ASCIIToUTF16(target_url));
(...skipping 25 matching lines...) Expand all
1645 clipboard->ReadBookmark(&title, &url); 1645 clipboard->ReadBookmark(&title, &url);
1646 EXPECT_EQ(target_url, url); 1646 EXPECT_EQ(target_url, url);
1647 EXPECT_EQ(ASCIIToUTF16(target_url), title); 1647 EXPECT_EQ(ASCIIToUTF16(target_url), title);
1648 #endif 1648 #endif
1649 } 1649 }
1650 1650
1651 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CutURLToClipboard) { 1651 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CutURLToClipboard) {
1652 // Set permanent text thus making sure that omnibox treats 'google.com' 1652 // Set permanent text thus making sure that omnibox treats 'google.com'
1653 // as URL (not as ordinary user input). 1653 // as URL (not as ordinary user input).
1654 TestToolbarModel* test_toolbar_model = new TestToolbarModel; 1654 TestToolbarModel* test_toolbar_model = new TestToolbarModel;
1655 scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model); 1655 std::unique_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
1656 test_toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/")); 1656 test_toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/"));
1657 browser()->swap_toolbar_models(&toolbar_model); 1657 browser()->swap_toolbar_models(&toolbar_model);
1658 OmniboxView* omnibox_view = NULL; 1658 OmniboxView* omnibox_view = NULL;
1659 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); 1659 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
1660 OmniboxEditModel* edit_model = omnibox_view->model(); 1660 OmniboxEditModel* edit_model = omnibox_view->model();
1661 ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model); 1661 ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
1662 edit_model->UpdatePermanentText(); 1662 edit_model->UpdatePermanentText();
1663 1663
1664 const char* target_url = "http://www.google.com/calendar"; 1664 const char* target_url = "http://www.google.com/calendar";
1665 omnibox_view->SetUserText(ASCIIToUTF16(target_url)); 1665 omnibox_view->SetUserText(ASCIIToUTF16(target_url));
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 // Switch back to the first tab. 1823 // Switch back to the first tab.
1824 browser()->tab_strip_model()->ActivateTabAt(0, true); 1824 browser()->tab_strip_model()->ActivateTabAt(0, true);
1825 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled()); 1825 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());
1826 } 1826 }
1827 1827
1828 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, 1828 IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
1829 DontUpdateURLWhileSearchTermReplacementIsDisabled) { 1829 DontUpdateURLWhileSearchTermReplacementIsDisabled) {
1830 OmniboxView* omnibox_view = NULL; 1830 OmniboxView* omnibox_view = NULL;
1831 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); 1831 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
1832 TestToolbarModel* test_toolbar_model = new TestToolbarModel; 1832 TestToolbarModel* test_toolbar_model = new TestToolbarModel;
1833 scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model); 1833 std::unique_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
1834 browser()->swap_toolbar_models(&toolbar_model); 1834 browser()->swap_toolbar_models(&toolbar_model);
1835 1835
1836 base::string16 url_a(ASCIIToUTF16("http://www.a.com/")); 1836 base::string16 url_a(ASCIIToUTF16("http://www.a.com/"));
1837 base::string16 url_b(ASCIIToUTF16("http://www.b.com/")); 1837 base::string16 url_b(ASCIIToUTF16("http://www.b.com/"));
1838 base::string16 url_c(ASCIIToUTF16("http://www.c.com/")); 1838 base::string16 url_c(ASCIIToUTF16("http://www.c.com/"));
1839 chrome::FocusLocationBar(browser()); 1839 chrome::FocusLocationBar(browser());
1840 test_toolbar_model->set_text(url_a); 1840 test_toolbar_model->set_text(url_a);
1841 omnibox_view->Update(); 1841 omnibox_view->Update();
1842 EXPECT_EQ(url_a, omnibox_view->GetText()); 1842 EXPECT_EQ(url_a, omnibox_view->GetText());
1843 1843
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1884 } 1884 }
1885 1885
1886 } // namespace 1886 } // namespace
1887 1887
1888 // Test that if the Omnibox has focus, and had everything selected before a 1888 // Test that if the Omnibox has focus, and had everything selected before a
1889 // non-user-initiated update, then it retains the selection after the update. 1889 // non-user-initiated update, then it retains the selection after the update.
1890 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, SelectAllStaysAfterUpdate) { 1890 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, SelectAllStaysAfterUpdate) {
1891 OmniboxView* omnibox_view = nullptr; 1891 OmniboxView* omnibox_view = nullptr;
1892 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); 1892 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
1893 TestToolbarModel* test_toolbar_model = new TestToolbarModel; 1893 TestToolbarModel* test_toolbar_model = new TestToolbarModel;
1894 scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model); 1894 std::unique_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
1895 browser()->swap_toolbar_models(&toolbar_model); 1895 browser()->swap_toolbar_models(&toolbar_model);
1896 1896
1897 base::string16 url_a(ASCIIToUTF16("http://www.a.com/")); 1897 base::string16 url_a(ASCIIToUTF16("http://www.a.com/"));
1898 base::string16 url_b(ASCIIToUTF16("http://www.b.com/")); 1898 base::string16 url_b(ASCIIToUTF16("http://www.b.com/"));
1899 chrome::FocusLocationBar(browser()); 1899 chrome::FocusLocationBar(browser());
1900 1900
1901 test_toolbar_model->set_text(url_a); 1901 test_toolbar_model->set_text(url_a);
1902 omnibox_view->Update(); 1902 omnibox_view->Update();
1903 EXPECT_EQ(url_a, omnibox_view->GetText()); 1903 EXPECT_EQ(url_a, omnibox_view->GetText());
1904 EXPECT_TRUE(omnibox_view->IsSelectAll()); 1904 EXPECT_TRUE(omnibox_view->IsSelectAll());
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
1949 1949
1950 // Now Shift+Right should do nothing, and Shift+Left should reduce. 1950 // Now Shift+Right should do nothing, and Shift+Left should reduce.
1951 // At the end, so Shift+Right should do nothing. 1951 // At the end, so Shift+Right should do nothing.
1952 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN)); 1952 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN));
1953 EXPECT_EQ(2u, GetSelectionSize(omnibox_view)); 1953 EXPECT_EQ(2u, GetSelectionSize(omnibox_view));
1954 1954
1955 // And Left should reduce by one character. 1955 // And Left should reduce by one character.
1956 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN)); 1956 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN));
1957 EXPECT_EQ(1u, GetSelectionSize(omnibox_view)); 1957 EXPECT_EQ(1u, GetSelectionSize(omnibox_view));
1958 } 1958 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_controller_unittest.cc ('k') | chrome/browser/ui/panels/base_panel_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698