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

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

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/web_dialogs/web_dialog_web_contents_delegate.h" 5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 test_web_contents_delegate_->LoadingStateChanged(NULL, true); 72 test_web_contents_delegate_->LoadingStateChanged(NULL, true);
73 test_web_contents_delegate_->CloseContents(NULL); 73 test_web_contents_delegate_->CloseContents(NULL);
74 test_web_contents_delegate_->UpdateTargetURL(NULL, 0, GURL()); 74 test_web_contents_delegate_->UpdateTargetURL(NULL, 0, GURL());
75 test_web_contents_delegate_->MoveContents(NULL, gfx::Rect()); 75 test_web_contents_delegate_->MoveContents(NULL, gfx::Rect());
76 EXPECT_EQ(0, browser()->tab_strip_model()->count()); 76 EXPECT_EQ(0, browser()->tab_strip_model()->count());
77 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 77 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
78 } 78 }
79 79
80 TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) { 80 TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
81 test_web_contents_delegate_->OpenURLFromTab( 81 test_web_contents_delegate_->OpenURLFromTab(
82 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), 82 NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
83 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); 83 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
84 // This should create a new foreground tab in the existing browser. 84 // This should create a new foreground tab in the existing browser.
85 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 85 EXPECT_EQ(1, browser()->tab_strip_model()->count());
86 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 86 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
87 } 87 }
88 88
89 TEST_F(WebDialogWebContentsDelegateTest, AddNewContentsForegroundTabTest) { 89 TEST_F(WebDialogWebContentsDelegateTest, AddNewContentsForegroundTabTest) {
90 WebContents* contents = 90 WebContents* contents =
91 WebContentsTester::CreateTestWebContents(profile(), NULL); 91 WebContentsTester::CreateTestWebContents(profile(), NULL);
92 test_web_contents_delegate_->AddNewContents( 92 test_web_contents_delegate_->AddNewContents(
93 NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL); 93 NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL);
94 // This should create a new foreground tab in the existing browser. 94 // This should create a new foreground tab in the existing browser.
95 EXPECT_EQ(1, browser()->tab_strip_model()->count()); 95 EXPECT_EQ(1, browser()->tab_strip_model()->count());
96 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 96 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
97 } 97 }
98 98
99 TEST_F(WebDialogWebContentsDelegateTest, DetachTest) { 99 TEST_F(WebDialogWebContentsDelegateTest, DetachTest) {
100 EXPECT_EQ(profile(), test_web_contents_delegate_->browser_context()); 100 EXPECT_EQ(profile(), test_web_contents_delegate_->browser_context());
101 test_web_contents_delegate_->Detach(); 101 test_web_contents_delegate_->Detach();
102 EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context()); 102 EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context());
103 // Now, none of the following calls should do anything. 103 // Now, none of the following calls should do anything.
104 test_web_contents_delegate_->OpenURLFromTab( 104 test_web_contents_delegate_->OpenURLFromTab(
105 NULL, OpenURLParams(GURL(content::kAboutBlankURL), Referrer(), 105 NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
106 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); 106 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
107 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, 107 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
108 gfx::Rect(), false, NULL); 108 gfx::Rect(), false, NULL);
109 EXPECT_EQ(0, browser()->tab_strip_model()->count()); 109 EXPECT_EQ(0, browser()->tab_strip_model()->count());
110 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 110 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
111 } 111 }
112 112
113 } // namespace 113 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698