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

Side by Side Diff: chrome/browser/ui/search/instant_extended_browsertest.cc

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:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/browser/ui/search/instant_extended_manual_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 <sstream>	5 #include <sstream>

6	6

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

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

9 #include "base/stringprintf.h"	9 #include "base/stringprintf.h"

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

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

12 #include "chrome/browser/autocomplete/autocomplete_provider.h"	12 #include "chrome/browser/autocomplete/autocomplete_provider.h"

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

14 #include "chrome/browser/extensions/extension_browsertest.h"	14 #include "chrome/browser/extensions/extension_browsertest.h"

15 #include "chrome/browser/extensions/extension_service.h"	15 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/favicon/favicon_tab_helper.h"	16 #include "chrome/browser/favicon/favicon_tab_helper.h"

17 #include "chrome/browser/history/history_types.h"	17 #include "chrome/browser/history/history_types.h"

18 #include "chrome/browser/history/top_sites.h"	18 #include "chrome/browser/history/top_sites.h"

19 #include "chrome/browser/instant/instant_commit_type.h"

20 #include "chrome/browser/instant/instant_ntp.h"

21 #include "chrome/browser/instant/instant_overlay.h"

22 #include "chrome/browser/instant/instant_service.h"	19 #include "chrome/browser/instant/instant_service.h"

23 #include "chrome/browser/instant/instant_service_factory.h"	20 #include "chrome/browser/instant/instant_service_factory.h"

24 #include "chrome/browser/instant/instant_tab.h"

25 #include "chrome/browser/instant/instant_test_utils.h"

26 #include "chrome/browser/instant/search.h"	21 #include "chrome/browser/instant/search.h"

27 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

28 #include "chrome/browser/themes/theme_service.h"	23 #include "chrome/browser/themes/theme_service.h"

29 #include "chrome/browser/themes/theme_service_factory.h"	24 #include "chrome/browser/themes/theme_service_factory.h"

30 #include "chrome/browser/ui/omnibox/omnibox_view.h"	25 #include "chrome/browser/ui/omnibox/omnibox_view.h"

	26 #include "chrome/browser/ui/search/instant_commit_type.h"

	27 #include "chrome/browser/ui/search/instant_ntp.h"

	28 #include "chrome/browser/ui/search/instant_overlay.h"

	29 #include "chrome/browser/ui/search/instant_tab.h"

	30 #include "chrome/browser/ui/search/instant_test_utils.h"

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

32 #include "chrome/browser/ui/webui/theme_source.h"	32 #include "chrome/browser/ui/webui/theme_source.h"

33 #include "chrome/common/chrome_notification_types.h"	33 #include "chrome/common/chrome_notification_types.h"

34 #include "chrome/common/pref_names.h"	34 #include "chrome/common/pref_names.h"

35 #include "chrome/common/thumbnail_score.h"	35 #include "chrome/common/thumbnail_score.h"

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

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

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

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

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

(...skipping 1208 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1249 // visibility has been reset and the string can again be read back.	1249 // visibility has been reset and the string can again be read back.

1250 stream.str(std::string());	1250 stream.str(std::string());

1251 stream << "apiHandle.setValue('" << kQueryString << "');";	1251 stream << "apiHandle.setValue('" << kQueryString << "');";

1252 EXPECT_TRUE(ExecuteScript(stream.str()));	1252 EXPECT_TRUE(ExecuteScript(stream.str()));

1253	1253

1254 EXPECT_TRUE(GetStringFromJS(instant()->GetOverlayContents(),	1254 EXPECT_TRUE(GetStringFromJS(instant()->GetOverlayContents(),

1255 "apiHandle.value",	1255 "apiHandle.value",

1256 &result));	1256 &result));

1257 EXPECT_EQ(kQueryString, result);	1257 EXPECT_EQ(kQueryString, result);

1258 }	1258 }

OLD	NEW