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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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 <stdio.h> 5 #include <stdio.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/scoped_observer.h" 8 #include "base/scoped_observer.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 1859 matching lines...) Expand 10 before | Expand all | Expand 10 after
1870 browser()->toolbar_model()->set_url_replacement_enabled(false); 1870 browser()->toolbar_model()->set_url_replacement_enabled(false);
1871 test_toolbar_model->set_text(url_b); 1871 test_toolbar_model->set_text(url_b);
1872 omnibox_view->Update(); 1872 omnibox_view->Update();
1873 EXPECT_EQ(url_a, omnibox_view->GetText()); 1873 EXPECT_EQ(url_a, omnibox_view->GetText());
1874 omnibox_view->RevertAll(); 1874 omnibox_view->RevertAll();
1875 EXPECT_EQ(url_b, omnibox_view->GetText()); 1875 EXPECT_EQ(url_b, omnibox_view->GetText());
1876 test_toolbar_model->set_text(url_c); 1876 test_toolbar_model->set_text(url_c);
1877 omnibox_view->Update(); 1877 omnibox_view->Update();
1878 EXPECT_EQ(url_c, omnibox_view->GetText()); 1878 EXPECT_EQ(url_c, omnibox_view->GetText());
1879 } 1879 }
1880
1881 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) {
1882 browser()->toolbar_model()->set_url_replacement_enabled(true);
1883 chrome::FocusLocationBar(browser());
1884 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));
1885 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());
1886 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_view.cc ('k') | chrome/browser/ui/toolbar/test_toolbar_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698