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

Unified Diff: chrome/test/ui/infobars_uitest.cc

Issue 1599038: Revert 44885 - Select and close previous theme info bars when resetting to de... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 8 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
« no previous file with comments | « chrome/test/pyautolib/pyautolib.i ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/infobars_uitest.cc
===================================================================
--- chrome/test/ui/infobars_uitest.cc (revision 44885)
+++ chrome/test/ui/infobars_uitest.cc (working copy)
@@ -1,50 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/extension_proxy.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/ui/ui_test.h"
-#include "net/url_request/url_request_unittest.h"
-
-class InfoBarsUITest : public UITest {
- public:
- InfoBarsUITest() {
- show_window_ = true;
- }
-};
-
-TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) {
- const wchar_t kDocRoot[] = L"chrome/test/data";
- scoped_refptr<HTTPTestServer> server =
- HTTPTestServer::CreateServer(kDocRoot, NULL);
- ASSERT_TRUE(server.get() != NULL);
- scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
- ASSERT_TRUE(browser.get());
-
- scoped_refptr<TabProxy> tab_1(browser->GetActiveTab());
- ASSERT_TRUE(tab_1.get());
- EXPECT_TRUE(tab_1->NavigateToURL(
- server->TestServerPageW(L"files/simple.html")));
- scoped_refptr<ExtensionProxy> theme = automation()->InstallExtension(
- test_data_directory_.AppendASCII("extensions").AppendASCII("theme.crx"),
- true);
- ASSERT_TRUE(theme != NULL);
- EXPECT_TRUE(tab_1->WaitForInfoBarCount(1, action_max_timeout_ms()));
-
- EXPECT_TRUE(browser->AppendTab(
- server->TestServerPageW(L"files/simple.html")));
- WaitUntilTabCount(2);
- scoped_refptr<TabProxy> tab_2(browser->GetActiveTab());
- ASSERT_TRUE(tab_2.get());
- theme = automation()->InstallExtension(
- test_data_directory_.AppendASCII("extensions").AppendASCII("theme2.crx"),
- true);
- ASSERT_TRUE(theme != NULL);
- EXPECT_TRUE(tab_2->WaitForInfoBarCount(1, action_max_timeout_ms()));
- EXPECT_TRUE(tab_1->WaitForInfoBarCount(0, action_max_timeout_ms()));
-
- EXPECT_TRUE(automation()->ResetToDefaultTheme());
- EXPECT_TRUE(tab_2->WaitForInfoBarCount(0, action_max_timeout_ms()));
-}
« no previous file with comments | « chrome/test/pyautolib/pyautolib.i ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698