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

Side by Side Diff: chrome/browser/tab_contents/navigation_controller_unittest.cc

Issue 6300001: Clang: enable -Wbool-conversions and -Wunused-variables on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, undo indent Created 9 years, 11 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/scoped_ptr.h" 7 #include "base/scoped_ptr.h"
8 #include "base/stl_util-inl.h" 8 #include "base/stl_util-inl.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 params.page_id = 0; 1634 params.page_id = 0;
1635 params.url = result_url; 1635 params.url = result_url;
1636 params.transition = PageTransition::SERVER_REDIRECT; 1636 params.transition = PageTransition::SERVER_REDIRECT;
1637 params.should_update_history = false; 1637 params.should_update_history = false;
1638 params.gesture = NavigationGestureAuto; 1638 params.gesture = NavigationGestureAuto;
1639 params.is_post = false; 1639 params.is_post = false;
1640 NavigationController::LoadCommittedDetails details; 1640 NavigationController::LoadCommittedDetails details;
1641 controller().RendererDidNavigate(params, 0, &details); 1641 controller().RendererDidNavigate(params, 0, &details);
1642 1642
1643 EXPECT_EQ(ASCIIToUTF16(kExpected), contents()->GetTitle()); 1643 EXPECT_EQ(ASCIIToUTF16(kExpected), contents()->GetTitle());
1644 EXPECT_EQ(true, contents()->ShouldDisplayURL()); 1644 EXPECT_TRUE(contents()->ShouldDisplayURL());
1645 } 1645 }
1646 1646
1647 // Make sure that on cloning a tabcontents and going back needs_reload is false. 1647 // Make sure that on cloning a tabcontents and going back needs_reload is false.
1648 TEST_F(NavigationControllerTest, CloneAndGoBack) { 1648 TEST_F(NavigationControllerTest, CloneAndGoBack) {
1649 const GURL url1("http://foo1"); 1649 const GURL url1("http://foo1");
1650 const GURL url2("http://foo2"); 1650 const GURL url2("http://foo2");
1651 1651
1652 NavigateAndCommit(url1); 1652 NavigateAndCommit(url1);
1653 NavigateAndCommit(url2); 1653 NavigateAndCommit(url2);
1654 1654
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 PageTransition::LINK); 2025 PageTransition::LINK);
2026 session_helper_.AssertNavigationEquals(nav, 2026 session_helper_.AssertNavigationEquals(nav,
2027 windows_[0]->tabs[0]->navigations[0]); 2027 windows_[0]->tabs[0]->navigations[0]);
2028 nav.set_url(url2); 2028 nav.set_url(url2);
2029 session_helper_.AssertNavigationEquals(nav, 2029 session_helper_.AssertNavigationEquals(nav,
2030 windows_[0]->tabs[0]->navigations[1]); 2030 windows_[0]->tabs[0]->navigations[1]);
2031 } 2031 }
2032 */ 2032 */
2033 2033
2034 } // namespace 2034 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698