chrome/browser/popup_blocker_browsertest.cc - Issue 14698028: Omnibox refactor. OmniboxController now holds an AutocompleteMatch.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/popup_blocker_browsertest.cc

Issue 14698028: Omnibox refactor. OmniboxController now holds an AutocompleteMatch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed failing browser tests. Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/ui/omnibox/omnibox_controller.h » ('j') | no next file with comments »

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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/files/file_path.h"	6 #include "base/files/file_path.h"

7 #include "base/message_loop.h"	7 #include "base/message_loop.h"

8 #include "base/path_service.h"	8 #include "base/path_service.h"

9 #include "chrome/browser/autocomplete/autocomplete_match.h"	9 #include "chrome/browser/autocomplete/autocomplete_match.h"

10 #include "chrome/browser/autocomplete/autocomplete_result.h"	10 #include "chrome/browser/autocomplete/autocomplete_result.h"

(...skipping 160 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
171 ASSERT_EQ(2u, history_urls.size());	171 ASSERT_EQ(2u, history_urls.size());

172 ASSERT_EQ(GURL(search_string), history_urls[0]);	172 ASSERT_EQ(GURL(search_string), history_urls[0]);

173 ASSERT_EQ(url, history_urls[1]);	173 ASSERT_EQ(url, history_urls[1]);

174	174

175 TemplateURLService* service = TemplateURLServiceFactory::GetForProfile(	175 TemplateURLService* service = TemplateURLServiceFactory::GetForProfile(

176 browser()->profile());	176 browser()->profile());

177 ui_test_utils::WaitForTemplateURLServiceToLoad(service);	177 ui_test_utils::WaitForTemplateURLServiceToLoad(service);

178 LocationBar* location_bar = browser()->window()->GetLocationBar();	178 LocationBar* location_bar = browser()->window()->GetLocationBar();

179 ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string);	179 ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string);

180 OmniboxEditModel* model = location_bar->GetLocationEntry()->model();	180 OmniboxEditModel* model = location_bar->GetLocationEntry()->model();

181 EXPECT_EQ(GURL(search_string), model->CurrentMatch().destination_url);	181 EXPECT_EQ(GURL(search_string), model->CurrentMatch(NULL).destination_url);

182 EXPECT_EQ(ASCIIToUTF16(search_string), model->CurrentMatch().contents);	182 EXPECT_EQ(ASCIIToUTF16(search_string), model->CurrentMatch(NULL).contents);

183 }	183 }

184	184

185 } // namespace	185 } // namespace

OLD	NEW