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

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

Issue 7568002: Move more files from chrome/test to chrome/test/base, part #6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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
Index: chrome/test/interactive_ui/infobars_uitest.cc
===================================================================
--- chrome/test/interactive_ui/infobars_uitest.cc (revision 95314)
+++ chrome/test/interactive_ui/infobars_uitest.cc (working copy)
@@ -1,51 +0,0 @@
-// Copyright (c) 2011 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/automation_proxy.h"
-#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/test/test_server.h"
-
-class InfoBarsUITest : public UITest {
- public:
- InfoBarsUITest() {
- show_window_ = true;
- }
-};
-
-TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) {
- net::TestServer test_server(net::TestServer::TYPE_HTTP,
- FilePath(FILE_PATH_LITERAL("chrome/test/data")));
- ASSERT_TRUE(test_server.Start());
-
- 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(
- test_server.GetURL("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));
-
- EXPECT_TRUE(browser->AppendTab(
- test_server.GetURL("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));
- EXPECT_TRUE(tab_1->WaitForInfoBarCount(0));
-
- EXPECT_TRUE(automation()->ResetToDefaultTheme());
- EXPECT_TRUE(tab_2->WaitForInfoBarCount(0));
-}
« no previous file with comments | « chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc ('k') | chrome/test/interactive_ui/keyboard_access_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698