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

Side by Side Diff: chrome/browser/ui/webui/log_web_ui_url_browsertest.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/ui/webui/log_web_ui_url.h" 5 #include "chrome/browser/ui/webui/log_web_ui_url.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 }; 52 };
53 53
54 IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestHistoryFrame) { 54 IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestHistoryFrame) {
55 GURL history_frame_url(chrome::kChromeUIHistoryFrameURL); 55 GURL history_frame_url(chrome::kChromeUIHistoryFrameURL);
56 56
57 ui_test_utils::NavigateToURL(browser(), history_frame_url); 57 ui_test_utils::NavigateToURL(browser(), history_frame_url);
58 58
59 uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); 59 uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec());
60 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1))); 60 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1)));
61 61
62 chrome::Reload(browser(), CURRENT_TAB); 62 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
63 63
64 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2))); 64 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2)));
65 } 65 }
66 66
67 #if defined(ENABLE_EXTENSIONS) 67 #if defined(ENABLE_EXTENSIONS)
68 IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { 68 IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) {
69 content::WebContents* tab = 69 content::WebContents* tab =
70 browser()->tab_strip_model()->GetActiveWebContents(); 70 browser()->tab_strip_model()->GetActiveWebContents();
71 71
72 base::string16 history_title = l10n_util::GetStringUTF16(IDS_HISTORY_TITLE); 72 base::string16 history_title = l10n_util::GetStringUTF16(IDS_HISTORY_TITLE);
(...skipping 13 matching lines...) Expand all
86 86
87 GURL history_frame_url(chrome::kChromeUIHistoryFrameURL); 87 GURL history_frame_url(chrome::kChromeUIHistoryFrameURL);
88 uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec()); 88 uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec());
89 89
90 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1), 90 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1),
91 Bucket(uber_frame_url_hash, 1), 91 Bucket(uber_frame_url_hash, 1),
92 Bucket(uber_url_hash, 1))); 92 Bucket(uber_url_hash, 1)));
93 93
94 { 94 {
95 content::TitleWatcher title_watcher(tab, history_title); 95 content::TitleWatcher title_watcher(tab, history_title);
96 chrome::Reload(browser(), CURRENT_TAB); 96 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
97 ASSERT_EQ(history_title, title_watcher.WaitAndGetTitle()); 97 ASSERT_EQ(history_title, title_watcher.WaitAndGetTitle());
98 } 98 }
99 99
100 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2), 100 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2),
101 Bucket(uber_frame_url_hash, 2), 101 Bucket(uber_frame_url_hash, 2),
102 Bucket(uber_url_hash, 2))); 102 Bucket(uber_url_hash, 2)));
103 103
104 { 104 {
105 // Pretend a user clicked on "Extensions". 105 // Pretend a user clicked on "Extensions".
106 base::string16 extensions_title = 106 base::string16 extensions_title =
107 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE); 107 l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
108 content::TitleWatcher title_watcher(tab, extensions_title); 108 content::TitleWatcher title_watcher(tab, extensions_title);
109 std::string javascript = 109 std::string javascript =
110 "uber.invokeMethodOnWindow(window, 'showPage', {pageId: 'extensions'})"; 110 "uber.invokeMethodOnWindow(window, 'showPage', {pageId: 'extensions'})";
111 ASSERT_TRUE(content::ExecuteScript(tab, javascript)); 111 ASSERT_TRUE(content::ExecuteScript(tab, javascript));
112 ASSERT_EQ(extensions_title, title_watcher.WaitAndGetTitle()); 112 ASSERT_EQ(extensions_title, title_watcher.WaitAndGetTitle());
113 } 113 }
114 114
115 GURL extensions_frame_url(chrome::kChromeUIExtensionsFrameURL); 115 GURL extensions_frame_url(chrome::kChromeUIExtensionsFrameURL);
116 uint32_t extensions_frame_url_hash = base::Hash(extensions_frame_url.spec()); 116 uint32_t extensions_frame_url_hash = base::Hash(extensions_frame_url.spec());
117 117
118 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(extensions_frame_url_hash, 1), 118 EXPECT_THAT(GetSamples(), ElementsAre(Bucket(extensions_frame_url_hash, 1),
119 Bucket(history_frame_url_hash, 2), 119 Bucket(history_frame_url_hash, 2),
120 Bucket(uber_frame_url_hash, 2), 120 Bucket(uber_frame_url_hash, 2),
121 Bucket(uber_url_hash, 2))); 121 Bucket(uber_url_hash, 2)));
122 } 122 }
123 #endif 123 #endif
124 124
125 } // namespace webui 125 } // namespace webui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698