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

Side by Side Diff: content/browser/tab_contents/navigation_entry_unittest.cc

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/string16.h" 5 #include "base/string16.h"
6 #include "base/string_util.h" 6 #include "base/string_util.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/site_instance.h" 8 #include "content/browser/site_instance.h"
9 #include "content/browser/tab_contents/navigation_entry.h" 9 #include "content/browser/tab_contents/navigation_entry.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 11
12 class NavigationEntryTest : public testing::Test { 12 class NavigationEntryTest : public testing::Test {
13 public: 13 public:
14 NavigationEntryTest() : instance_(NULL) { 14 NavigationEntryTest() : instance_(NULL) {
15 } 15 }
16 16
17 virtual void SetUp() { 17 virtual void SetUp() {
18 entry1_.reset(new NavigationEntry); 18 entry1_.reset(new NavigationEntry);
19 19
20 instance_ = SiteInstance::CreateSiteInstance(NULL); 20 instance_ = SiteInstance::CreateSiteInstance(NULL);
21 entry2_.reset(new NavigationEntry(instance_, 3, 21 entry2_.reset(new NavigationEntry(instance_, 3,
22 GURL("test:url"), 22 GURL("test:url"),
23 GURL("from"), 23 GURL("from"),
24 ASCIIToUTF16("title"), 24 ASCIIToUTF16("title"),
25 content::PAGE_TRANSITION_TYPED)); 25 content::PAGE_TRANSITION_TYPED,
26 false));
26 } 27 }
27 28
28 virtual void TearDown() { 29 virtual void TearDown() {
29 } 30 }
30 31
31 protected: 32 protected:
32 scoped_ptr<NavigationEntry> entry1_; 33 scoped_ptr<NavigationEntry> entry1_;
33 scoped_ptr<NavigationEntry> entry2_; 34 scoped_ptr<NavigationEntry> entry2_;
34 // SiteInstances are deleted when their NavigationEntries are gone. 35 // SiteInstances are deleted when their NavigationEntries are gone.
35 SiteInstance* instance_; 36 SiteInstance* instance_;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 EXPECT_EQ(3, entry2_.get()->page_id()); 169 EXPECT_EQ(3, entry2_.get()->page_id());
169 entry2_.get()->set_page_id(2); 170 entry2_.get()->set_page_id(2);
170 EXPECT_EQ(2, entry2_.get()->page_id()); 171 EXPECT_EQ(2, entry2_.get()->page_id());
171 172
172 // Transition type 173 // Transition type
173 EXPECT_EQ(content::PAGE_TRANSITION_LINK, entry1_.get()->transition_type()); 174 EXPECT_EQ(content::PAGE_TRANSITION_LINK, entry1_.get()->transition_type());
174 EXPECT_EQ(content::PAGE_TRANSITION_TYPED, entry2_.get()->transition_type()); 175 EXPECT_EQ(content::PAGE_TRANSITION_TYPED, entry2_.get()->transition_type());
175 entry2_.get()->set_transition_type(content::PAGE_TRANSITION_RELOAD); 176 entry2_.get()->set_transition_type(content::PAGE_TRANSITION_RELOAD);
176 EXPECT_EQ(content::PAGE_TRANSITION_RELOAD, entry2_.get()->transition_type()); 177 EXPECT_EQ(content::PAGE_TRANSITION_RELOAD, entry2_.get()->transition_type());
177 178
179 // Is renderer initiated
180 EXPECT_FALSE(entry1_.get()->is_renderer_initiated());
181 EXPECT_FALSE(entry2_.get()->is_renderer_initiated());
182 entry2_.get()->set_is_renderer_initiated(true);
183 EXPECT_TRUE(entry2_.get()->is_renderer_initiated());
184
178 // Post Data 185 // Post Data
179 EXPECT_FALSE(entry1_.get()->has_post_data()); 186 EXPECT_FALSE(entry1_.get()->has_post_data());
180 EXPECT_FALSE(entry2_.get()->has_post_data()); 187 EXPECT_FALSE(entry2_.get()->has_post_data());
181 entry2_.get()->set_has_post_data(true); 188 entry2_.get()->set_has_post_data(true);
182 EXPECT_TRUE(entry2_.get()->has_post_data()); 189 EXPECT_TRUE(entry2_.get()->has_post_data());
183 190
184 // Restored 191 // Restored
185 EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type()); 192 EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
186 EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type()); 193 EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
187 entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION); 194 entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
188 EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type()); 195 EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
189 } 196 }
OLDNEW
« no previous file with comments | « content/browser/tab_contents/navigation_entry.cc ('k') | content/browser/tab_contents/page_navigator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698