chrome/browser/ui/search/instant_test_utils.h - Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search.

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_test_utils.h

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 7 years, 9 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:

Index: chrome/browser/ui/search/instant_test_utils.h

diff --git a/chrome/browser/instant/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h

similarity index 92%

rename from chrome/browser/instant/instant_test_utils.h

rename to chrome/browser/ui/search/instant_test_utils.h

index c349cbabd6fbee6c4ecac397a92393b9668fca9e..fce05ba64881d90c5b86c046aaa72c8301160962 100644

--- a/chrome/browser/instant/instant_test_utils.h

+++ b/chrome/browser/ui/search/instant_test_utils.h

@@ -2,20 +2,20 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_

-#define CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_

+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_

+#define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_

#include <string>

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/run_loop.h"

-#include "chrome/browser/instant/instant_controller.h"

-#include "chrome/browser/instant/instant_overlay_model_observer.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_instant_controller.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/omnibox/location_bar.h"

+#include "chrome/browser/ui/search/instant_controller.h"

+#include "chrome/browser/ui/search/instant_overlay_model_observer.h"

#include "chrome/common/search_types.h"

#include "googleurl/src/gurl.h"

#include "net/test/test_server.h"

@@ -122,4 +122,4 @@ class InstantTestBase {

DISALLOW_COPY_AND_ASSIGN(InstantTestBase);

};

-#endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_

+#endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_