chrome/browser/ui/omnibox/omnibox_view_browsertest.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

OLD	NEW
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/strings/string16.h"	7 #include "base/strings/string16.h"

8 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "base/time/time.h"	10 #include "base/time/time.h"

(...skipping 15 matching lines...) Expand all Loading...
26 #include "chrome/browser/ui/omnibox/location_bar.h"	26 #include "chrome/browser/ui/omnibox/location_bar.h"

27 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	27 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

28 #include "chrome/browser/ui/omnibox/omnibox_view.h"	28 #include "chrome/browser/ui/omnibox/omnibox_view.h"

29 #include "chrome/browser/ui/tabs/tab_strip_model.h"	29 #include "chrome/browser/ui/tabs/tab_strip_model.h"

30 #include "chrome/browser/ui/toolbar/test_toolbar_model.h"	30 #include "chrome/browser/ui/toolbar/test_toolbar_model.h"

31 #include "chrome/common/chrome_paths.h"	31 #include "chrome/common/chrome_paths.h"

32 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

33 #include "chrome/test/base/in_process_browser_test.h"	33 #include "chrome/test/base/in_process_browser_test.h"

34 #include "chrome/test/base/interactive_test_utils.h"	34 #include "chrome/test/base/interactive_test_utils.h"

35 #include "chrome/test/base/ui_test_utils.h"	35 #include "chrome/test/base/ui_test_utils.h"

36 #include "components/bookmarks/core/browser/bookmark_model.h"	36 #include "components/bookmarks/browser/bookmark_model.h"

37 #include "components/bookmarks/core/browser/bookmark_utils.h"	37 #include "components/bookmarks/browser/bookmark_utils.h"

38 #include "components/bookmarks/core/test/bookmark_test_helpers.h"	38 #include "components/bookmarks/test/bookmark_test_helpers.h"

39 #include "content/public/browser/notification_service.h"	39 #include "content/public/browser/notification_service.h"

40 #include "content/public/browser/web_contents.h"	40 #include "content/public/browser/web_contents.h"

41 #include "net/dns/mock_host_resolver.h"	41 #include "net/dns/mock_host_resolver.h"

42 #include "ui/base/clipboard/clipboard.h"	42 #include "ui/base/clipboard/clipboard.h"

43 #include "ui/base/clipboard/scoped_clipboard_writer.h"	43 #include "ui/base/clipboard/scoped_clipboard_writer.h"

44 #include "ui/events/event_constants.h"	44 #include "ui/events/event_constants.h"

45 #include "ui/events/keycodes/keyboard_codes.h"	45 #include "ui/events/keycodes/keyboard_codes.h"

46 #include "ui/gfx/point.h"	46 #include "ui/gfx/point.h"

47	47

48 using base::ASCIIToUTF16;	48 using base::ASCIIToUTF16;

(...skipping 1736 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1785 omnibox_view->Update();	1785 omnibox_view->Update();

1786 EXPECT_EQ(url_c, omnibox_view->GetText());	1786 EXPECT_EQ(url_c, omnibox_view->GetText());

1787 }	1787 }

1788	1788

1789 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) {	1789 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) {

1790 browser()->toolbar_model()->set_url_replacement_enabled(true);	1790 browser()->toolbar_model()->set_url_replacement_enabled(true);

1791 chrome::FocusLocationBar(browser());	1791 chrome::FocusLocationBar(browser());

1792 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));	1792 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));

1793 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());	1793 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());

1794 }	1794 }

OLD	NEW