Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

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

Issue 18223002: InstantExtended: Remove overlay control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Call renamed method. Created 7 years, 5 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
OLDNEW
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"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/browser/search/search.h" 36 #include "chrome/browser/search/search.h"
37 #include "chrome/browser/search_engines/template_url_service.h" 37 #include "chrome/browser/search_engines/template_url_service.h"
38 #include "chrome/browser/search_engines/template_url_service_factory.h" 38 #include "chrome/browser/search_engines/template_url_service_factory.h"
39 #include "chrome/browser/task_manager/task_manager.h" 39 #include "chrome/browser/task_manager/task_manager.h"
40 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 40 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
41 #include "chrome/browser/themes/theme_service.h" 41 #include "chrome/browser/themes/theme_service.h"
42 #include "chrome/browser/themes/theme_service_factory.h" 42 #include "chrome/browser/themes/theme_service_factory.h"
43 #include "chrome/browser/ui/browser_list.h" 43 #include "chrome/browser/ui/browser_list.h"
44 #include "chrome/browser/ui/browser_tabstrip.h" 44 #include "chrome/browser/ui/browser_tabstrip.h"
45 #include "chrome/browser/ui/omnibox/omnibox_view.h" 45 #include "chrome/browser/ui/omnibox/omnibox_view.h"
46 #include "chrome/browser/ui/search/instant_commit_type.h"
47 #include "chrome/browser/ui/search/instant_ntp.h" 46 #include "chrome/browser/ui/search/instant_ntp.h"
48 #include "chrome/browser/ui/search/instant_overlay.h"
49 #include "chrome/browser/ui/search/instant_tab.h" 47 #include "chrome/browser/ui/search/instant_tab.h"
50 #include "chrome/browser/ui/search/instant_test_utils.h" 48 #include "chrome/browser/ui/search/instant_test_utils.h"
51 #include "chrome/browser/ui/search/search_tab_helper.h" 49 #include "chrome/browser/ui/search/search_tab_helper.h"
52 #include "chrome/browser/ui/tabs/tab_strip_model.h" 50 #include "chrome/browser/ui/tabs/tab_strip_model.h"
53 #include "chrome/browser/ui/webui/theme_source.h" 51 #include "chrome/browser/ui/webui/theme_source.h"
54 #include "chrome/common/chrome_notification_types.h" 52 #include "chrome/common/chrome_notification_types.h"
55 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
56 #include "chrome/common/instant_types.h" 54 #include "chrome/common/instant_types.h"
57 #include "chrome/common/pref_names.h" 55 #include "chrome/common/pref_names.h"
58 #include "chrome/common/thumbnail_score.h" 56 #include "chrome/common/thumbnail_score.h"
(...skipping 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 EXPECT_TRUE(active_tab->GetController().CanGoBack()); 1768 EXPECT_TRUE(active_tab->GetController().CanGoBack());
1771 active_tab->GetController().GoBack(); 1769 active_tab->GetController().GoBack();
1772 back_observer.Wait(); 1770 back_observer.Wait();
1773 1771
1774 // Verify that onmostvisitedchange event is dispatched when we navigate from 1772 // Verify that onmostvisitedchange event is dispatched when we navigate from
1775 // SRP to NTP. 1773 // SRP to NTP.
1776 active_tab = browser()->tab_strip_model()->GetActiveWebContents(); 1774 active_tab = browser()->tab_strip_model()->GetActiveWebContents();
1777 EXPECT_TRUE(UpdateSearchState(active_tab)); 1775 EXPECT_TRUE(UpdateSearchState(active_tab));
1778 EXPECT_EQ(1, on_most_visited_change_calls_); 1776 EXPECT_EQ(1, on_most_visited_change_calls_);
1779 } 1777 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698