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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Issue 18119005: Misc. cleanup: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
===================================================================
--- chrome/browser/ui/toolbar/toolbar_model_unittest.cc (revision 208964)
+++ chrome/browser/ui/toolbar/toolbar_model_unittest.cc (working copy)
@@ -256,14 +256,11 @@
TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionDisabled) {
ASSERT_FALSE(chrome::IsQueryExtractionEnabled())
<< "This test expects query extraction to be disabled.";
- ResetDefaultTemplateURL();
AddTab(browser(), GURL(content::kAboutBlankURL));
for (size_t i = 0; i < arraysize(test_items); ++i) {
const TestItem& test_item = test_items[i];
- NavigateAndCheckText(test_item.url,
- test_item.expected_text,
- test_item.expected_replace_text_inactive,
- false,
+ NavigateAndCheckText(test_item.url, test_item.expected_text,
+ test_item.expected_replace_text_inactive, false,
test_item.should_display);
}
}
@@ -271,15 +268,12 @@
// Test that we replace URLs when the query extraction API is enabled.
TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionEnabled) {
chrome::EnableInstantExtendedAPIForTesting();
- ResetDefaultTemplateURL();
AddTab(browser(), GURL(content::kAboutBlankURL));
for (size_t i = 0; i < arraysize(test_items); ++i) {
const TestItem& test_item = test_items[i];
- NavigateAndCheckText(test_item.url,
- test_item.expected_text,
+ NavigateAndCheckText(test_item.url, test_item.expected_text,
test_item.expected_replace_text_active,
- test_item.would_replace,
- test_item.should_display);
+ test_item.would_replace, test_item.should_display);
}
}
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_win.cc ('k') | chrome/browser/ui/views/frame/browser_frame_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698