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

Unified Diff: chrome/browser/ui/global_error_service_browsertest.cc

Issue 10700027: browser: Move global error to subdir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/global_error_service.cc ('k') | chrome/browser/ui/global_error_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/global_error_service_browsertest.cc
diff --git a/chrome/browser/ui/global_error_service_browsertest.cc b/chrome/browser/ui/global_error_service_browsertest.cc
deleted file mode 100644
index b1dc29102b03544606427f337d7c49fd80e740cd..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/global_error_service_browsertest.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) 2012 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/browser/ui/global_error_service.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/global_error.h"
-#include "chrome/browser/ui/global_error_bubble_view_base.h"
-#include "chrome/browser/ui/global_error_service_factory.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-
-namespace {
-
-// An error that has a bubble view.
-class BubbleViewError : public GlobalError {
- public:
- BubbleViewError() : bubble_view_close_count_(0) { }
-
- int bubble_view_close_count() { return bubble_view_close_count_; }
-
- bool HasBadge() OVERRIDE { return false; }
- virtual int GetBadgeResourceID() OVERRIDE {
- ADD_FAILURE();
- return 0;
- }
-
- virtual bool HasMenuItem() OVERRIDE { return false; }
- virtual int MenuItemCommandID() OVERRIDE {
- ADD_FAILURE();
- return 0;
- }
- virtual string16 MenuItemLabel() OVERRIDE {
- ADD_FAILURE();
- return string16();
- }
- virtual int MenuItemIconResourceID() OVERRIDE {
- ADD_FAILURE();
- return 0;
- }
- virtual void ExecuteMenuItem(Browser* browser) OVERRIDE { ADD_FAILURE(); }
-
- virtual bool HasBubbleView() OVERRIDE { return true; }
- virtual string16 GetBubbleViewTitle() OVERRIDE {
- return string16();
- }
- virtual string16 GetBubbleViewMessage() OVERRIDE {
- return string16();
- }
- virtual string16 GetBubbleViewAcceptButtonLabel() OVERRIDE {
- return string16();
- }
- virtual string16 GetBubbleViewCancelButtonLabel() OVERRIDE {
- return string16();
- }
- virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE {
- EXPECT_TRUE(browser);
- ++bubble_view_close_count_;
- }
- virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE {}
- virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE {}
-
- private:
- int bubble_view_close_count_;
-
- DISALLOW_COPY_AND_ASSIGN(BubbleViewError);
-};
-
-} // namespace
-
-class GlobalErrorServiceBrowserTest : public InProcessBrowserTest {
-};
-
-// Test that showing a error with a bubble view works.
-IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, ShowBubbleView) {
- // This will be deleted by the GlobalErrorService.
- BubbleViewError* error = new BubbleViewError;
-
- GlobalErrorService* service =
- GlobalErrorServiceFactory::GetForProfile(browser()->profile());
- service->AddGlobalError(error);
-
- EXPECT_EQ(error, service->GetFirstGlobalErrorWithBubbleView());
- EXPECT_FALSE(error->HasShownBubbleView());
- EXPECT_EQ(0, error->bubble_view_close_count());
-
- // Creating a second browser window should show the bubble view.
- CreateBrowser(browser()->profile());
- EXPECT_EQ(NULL, service->GetFirstGlobalErrorWithBubbleView());
- EXPECT_TRUE(error->HasShownBubbleView());
- EXPECT_EQ(0, error->bubble_view_close_count());
-}
-
-// Test that GlobalErrorBubbleViewBase::CloseBubbleView correctly closes the
-// bubble view.
-IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest, CloseBubbleView) {
- // This will be deleted by the GlobalErrorService.
- BubbleViewError* error = new BubbleViewError;
-
- GlobalErrorService* service =
- GlobalErrorServiceFactory::GetForProfile(browser()->profile());
- service->AddGlobalError(error);
-
- EXPECT_EQ(error, service->GetFirstGlobalErrorWithBubbleView());
- EXPECT_FALSE(error->HasShownBubbleView());
- EXPECT_EQ(0, error->bubble_view_close_count());
-
- // Creating a second browser window should show the bubble view.
- CreateBrowser(browser()->profile());
- EXPECT_EQ(NULL, service->GetFirstGlobalErrorWithBubbleView());
- EXPECT_TRUE(error->HasShownBubbleView());
- EXPECT_EQ(0, error->bubble_view_close_count());
-
- // Explicitly close the bubble view.
- EXPECT_TRUE(error->GetBubbleView());
- error->GetBubbleView()->CloseBubbleView();
- ui_test_utils::RunAllPendingInMessageLoop();
- EXPECT_EQ(1, error->bubble_view_close_count());
-}
-
-// Test that bubble is silently dismissed if it is showing when the GlobalError
-// instance is removed from the profile.
-#if defined(OS_WIN)
-#define MAYBE_BubbleViewDismissedOnRemove DISABLED_BubbleViewDismissedOnRemove
-#else
-#define MAYBE_BubbleViewDismissedOnRemove BubbleViewDismissedOnRemove
-#endif
-IN_PROC_BROWSER_TEST_F(GlobalErrorServiceBrowserTest,
- MAYBE_BubbleViewDismissedOnRemove) {
- scoped_ptr<BubbleViewError> error(new BubbleViewError);
-
- GlobalErrorService* service =
- GlobalErrorServiceFactory::GetForProfile(browser()->profile());
- service->AddGlobalError(error.get());
-
- EXPECT_EQ(error.get(), service->GetFirstGlobalErrorWithBubbleView());
- error->ShowBubbleView(browser());
- ui_test_utils::RunAllPendingInMessageLoop();
- EXPECT_TRUE(error->HasShownBubbleView());
- EXPECT_EQ(0, error->bubble_view_close_count());
-
- // Removing |error| from profile should dismiss the bubble view without
- // calling |error->BubbleViewDidClose|.
- service->RemoveGlobalError(error.get());
- ui_test_utils::RunAllPendingInMessageLoop();
- EXPECT_EQ(1, error->bubble_view_close_count());
- // |error| is no longer owned by service and will be deleted.
-}
« no previous file with comments | « chrome/browser/ui/global_error_service.cc ('k') | chrome/browser/ui/global_error_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698