chrome/browser/ui/search/instant_extended_interactive_uitest.cc - Issue 815983002: Topsites become keyedService based.

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

Issue 815983002: Topsites become keyedService based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 years 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

« chrome/browser/profiles/profile_impl.cc ('K') | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/tabs/tab_strip_model_utils.h » ('j') | chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

8 #include "base/metrics/histogram_base.h"	8 #include "base/metrics/histogram_base.h"

9 #include "base/metrics/histogram_samples.h"	9 #include "base/metrics/histogram_samples.h"

10 #include "base/metrics/statistics_recorder.h"	10 #include "base/metrics/statistics_recorder.h"

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

12 #include "base/run_loop.h"	12 #include "base/run_loop.h"

13 #include "base/strings/string_number_conversions.h"	13 #include "base/strings/string_number_conversions.h"

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

15 #include "base/strings/stringprintf.h"	15 #include "base/strings/stringprintf.h"

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

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

18 #include "chrome/browser/autocomplete/autocomplete_controller.h"	18 #include "chrome/browser/autocomplete/autocomplete_controller.h"

19 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	19 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

20 #include "chrome/browser/chrome_notification_types.h"	20 #include "chrome/browser/chrome_notification_types.h"

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

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

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

24 #include "chrome/browser/history/history_db_task.h"	24 #include "chrome/browser/history/history_db_task.h"

25 #include "chrome/browser/history/history_service.h"	25 #include "chrome/browser/history/history_service.h"

26 #include "chrome/browser/history/history_service_factory.h"	26 #include "chrome/browser/history/history_service_factory.h"

27 #include "chrome/browser/history/top_sites.h"	27 #include "chrome/browser/history/top_sites_provider.h"

28 #include "chrome/browser/profiles/profile.h"	28 #include "chrome/browser/profiles/profile.h"

29 #include "chrome/browser/search/instant_service.h"	29 #include "chrome/browser/search/instant_service.h"

30 #include "chrome/browser/search/instant_service_factory.h"	30 #include "chrome/browser/search/instant_service_factory.h"

31 #include "chrome/browser/search/search.h"	31 #include "chrome/browser/search/search.h"

32 #include "chrome/browser/search_engines/template_url_service_factory.h"	32 #include "chrome/browser/search_engines/template_url_service_factory.h"

33 #include "chrome/browser/task_manager/task_manager.h"	33 #include "chrome/browser/task_manager/task_manager.h"

34 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"	34 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"

35 #include "chrome/browser/themes/theme_service.h"	35 #include "chrome/browser/themes/theme_service.h"

36 #include "chrome/browser/themes/theme_service_factory.h"	36 #include "chrome/browser/themes/theme_service_factory.h"

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

(...skipping 931 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
969 stream << "link.href = \"" << result_url.spec() << "\";";	969 stream << "link.href = \"" << result_url.spec() << "\";";

970 stream << "document.body.appendChild(link);";	970 stream << "document.body.appendChild(link);";

971 stream << "link.click();";	971 stream << "link.click();";

972 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));	972 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));

973	973

974 content::WaitForLoadStop(contents);	974 content::WaitForLoadStop(contents);

975 std::string expected_title =	975 std::string expected_title =

976 "Referrer is " + instant_url().GetWithEmptyPath().spec();	976 "Referrer is " + instant_url().GetWithEmptyPath().spec();

977 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());	977 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());

978 }	978 }

OLD	NEW