| OLD | NEW |
| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/notifications/balloon.h" | 7 #include "chrome/browser/notifications/balloon.h" |
| 8 #include "chrome/browser/notifications/balloon_collection.h" | 8 #include "chrome/browser/notifications/balloon_collection.h" |
| 9 #include "chrome/browser/notifications/notification.h" | 9 #include "chrome/browser/notifications/notification.h" |
| 10 #include "chrome/browser/notifications/notification_object_proxy.h" | 10 #include "chrome/browser/notifications/notification_object_proxy.h" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 return balloons_; | 51 return balloons_; |
| 52 } | 52 } |
| 53 private: | 53 private: |
| 54 Balloons balloons_; | 54 Balloons balloons_; |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 class BalloonControllerTest : public ChromeRenderViewHostTestHarness { | 57 class BalloonControllerTest : public ChromeRenderViewHostTestHarness { |
| 58 virtual void SetUp() OVERRIDE { | 58 virtual void SetUp() OVERRIDE { |
| 59 ChromeRenderViewHostTestHarness::SetUp(); | 59 ChromeRenderViewHostTestHarness::SetUp(); |
| 60 CocoaTest::BootstrapCocoa(); | 60 CocoaTest::BootstrapCocoa(); |
| 61 profile()->CreateRequestContext(); | |
| 62 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); | 61 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); |
| 63 browser_.reset( | 62 browser_.reset( |
| 64 chrome::CreateBrowserWithTestWindowForParams(&native_params)); | 63 chrome::CreateBrowserWithTestWindowForParams(&native_params)); |
| 65 collection_.reset(new MockBalloonCollection()); | 64 collection_.reset(new MockBalloonCollection()); |
| 66 } | 65 } |
| 67 | 66 |
| 68 virtual void TearDown() OVERRIDE { | 67 virtual void TearDown() OVERRIDE { |
| 69 collection_.reset(); | 68 collection_.reset(); |
| 70 browser_.reset(); | 69 browser_.reset(); |
| 71 ChromeRenderViewHostTestHarness::TearDown(); | 70 ChromeRenderViewHostTestHarness::TearDown(); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 105 |
| 107 [controller showWindow:nil]; | 106 [controller showWindow:nil]; |
| 108 | 107 |
| 109 EXPECT_TRUE([controller desiredTotalWidth] > 100); | 108 EXPECT_TRUE([controller desiredTotalWidth] > 100); |
| 110 EXPECT_TRUE([controller desiredTotalHeight] > 100); | 109 EXPECT_TRUE([controller desiredTotalHeight] > 100); |
| 111 | 110 |
| 112 [controller closeBalloon:YES]; | 111 [controller closeBalloon:YES]; |
| 113 } | 112 } |
| 114 | 113 |
| 115 } | 114 } |
| OLD | NEW |