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

Side by Side Diff: chrome/browser/views/find_bar_host_uitest.cc

Issue 1814002: Remove deprecated things from net test suite: (Closed)
Patch Set: Created 10 years, 7 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 (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/app/chrome_dll_resource.h" 5 #include "chrome/app/chrome_dll_resource.h"
6 #include "chrome/test/automation/browser_proxy.h" 6 #include "chrome/test/automation/browser_proxy.h"
7 #include "chrome/test/automation/tab_proxy.h" 7 #include "chrome/test/automation/tab_proxy.h"
8 #include "chrome/test/ui/ui_test.h" 8 #include "chrome/test/ui/ui_test.h"
9 #include "net/url_request/url_request_unittest.h" 9 #include "net/url_request/url_request_unittest.h"
10 10
11 class FindInPageControllerTest : public UITest { 11 class FindInPageControllerTest : public UITest {
12 public: 12 public:
13 FindInPageControllerTest() { 13 FindInPageControllerTest() {
14 show_window_ = true; 14 show_window_ = true;
15 } 15 }
16 }; 16 };
17 17
18 const std::wstring kSimplePage = L"404_is_enough_for_us.html"; 18 const std::string kSimplePage = "404_is_enough_for_us.html";
19 19
20 // The find window should not change its location just because we open and close 20 // The find window should not change its location just because we open and close
21 // a new tab. 21 // a new tab.
22 TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) { 22 TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
23 scoped_refptr<HTTPTestServer> server = 23 scoped_refptr<HTTPTestServer> server =
24 HTTPTestServer::CreateServer(L"chrome/test/data", NULL); 24 HTTPTestServer::CreateServer(L"chrome/test/data", NULL);
25 ASSERT_TRUE(NULL != server.get()); 25 ASSERT_TRUE(NULL != server.get());
26 26
27 GURL url = server->TestServerPageW(kSimplePage); 27 GURL url = server->TestServerPage(kSimplePage);
28 scoped_refptr<TabProxy> tabA(GetActiveTab()); 28 scoped_refptr<TabProxy> tabA(GetActiveTab());
29 ASSERT_TRUE(tabA.get()); 29 ASSERT_TRUE(tabA.get());
30 ASSERT_TRUE(tabA->NavigateToURL(url)); 30 ASSERT_TRUE(tabA->NavigateToURL(url));
31 WaitUntilTabCount(1); 31 WaitUntilTabCount(1);
32 32
33 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 33 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
34 ASSERT_TRUE(browser.get() != NULL); 34 ASSERT_TRUE(browser.get() != NULL);
35 35
36 // Toggle the bookmark bar state. 36 // Toggle the bookmark bar state.
37 browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR); 37 browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 // Close it. 75 // Close it.
76 EXPECT_TRUE(tabC->Close(true)); 76 EXPECT_TRUE(tabC->Close(true));
77 77
78 // See if the Find window has moved. 78 // See if the Find window has moved.
79 EXPECT_TRUE(browser->GetFindWindowLocation(&new_x, &new_y)); 79 EXPECT_TRUE(browser->GetFindWindowLocation(&new_x, &new_y));
80 80
81 EXPECT_EQ(x, new_x); 81 EXPECT_EQ(x, new_x);
82 EXPECT_EQ(y, new_y); 82 EXPECT_EQ(y, new_y);
83 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698