chrome/browser/ui/search/instant_extended_interactive_uitest.cc - Issue 1260033003: Partially componentize //chrome/browser/search/search.{h,cc}

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

Unified Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 1260033003: Partially componentize //chrome/browser/search/search.{h,cc} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on iOS Created 5 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc

index f41690b9d941f0b684d47552b5a85010b90f1808..e96ee150a66ce730ca989563a167d0ab77fb0b22 100644

--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc

+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc

@@ -56,6 +56,7 @@

#include "components/omnibox/browser/autocomplete_result.h"

#include "components/omnibox/browser/omnibox_field_trial.h"

#include "components/omnibox/browser/search_provider.h"

+#include "components/search/search.h"

#include "components/search_engines/template_url_service.h"

#include "components/sessions/serialized_navigation_entry.h"

#include "content/public/browser/navigation_controller.h"

@@ -140,7 +141,7 @@ class InstantExtendedTest : public InProcessBrowserTest,

}

protected:

void SetUpInProcessBrowserTestFixture() override {

- chrome::EnableQueryExtractionForTesting();

+ search::EnableQueryExtractionForTesting();

ASSERT_TRUE(https_test_server().Start());

GURL instant_url = https_test_server().GetURL(

"files/instant_extended.html?strk=1&");

@@ -255,7 +256,7 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {

}

void SetUpInProcessBrowserTestFixture() override {

- chrome::EnableQueryExtractionForTesting();

+ search::EnableQueryExtractionForTesting();

ASSERT_TRUE(https_test_server().Start());

GURL instant_url = https_test_server().GetURL(

"files/instant_extended.html?strk=1&");

@@ -750,7 +751,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_NavigateBackToNTP) {

load_stop_observer_2.Wait();

active_tab = browser()->tab_strip_model()->GetActiveWebContents();

- EXPECT_TRUE(chrome::IsInstantNTP(active_tab));

+ EXPECT_TRUE(search::IsInstantNTP(active_tab));

}

// Flaky: crbug.com/267119