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

Side by Side Diff: chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc

Issue 10356025: chrome: Instead of doing a conversion just use string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
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 "chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h" 5 #include "chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/browser_dialogs.h" 9 #include "chrome/browser/ui/browser_dialogs.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_list.h" 11 #include "chrome/browser/ui/browser_list.h"
12 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" 12 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 class MockTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate { 17 class MockTabModalConfirmDialogDelegate : public TabModalConfirmDialogDelegate {
18 public: 18 public:
19 explicit MockTabModalConfirmDialogDelegate(content::WebContents* web_contents) 19 explicit MockTabModalConfirmDialogDelegate(content::WebContents* web_contents)
20 : TabModalConfirmDialogDelegate(web_contents) {} 20 : TabModalConfirmDialogDelegate(web_contents) {}
21 21
22 virtual string16 GetTitle() OVERRIDE { 22 virtual string16 GetTitle() OVERRIDE {
23 return ASCIIToUTF16(""); 23 return string16()
24 } 24 }
25 virtual string16 GetMessage() OVERRIDE { 25 virtual string16 GetMessage() OVERRIDE {
26 return ASCIIToUTF16(""); 26 return string16();
27 } 27 }
28 28
29 MOCK_METHOD0(OnAccepted, void()); 29 MOCK_METHOD0(OnAccepted, void());
30 MOCK_METHOD0(OnCanceled, void()); 30 MOCK_METHOD0(OnCanceled, void());
31 31
32 private: 32 private:
33 DISALLOW_COPY_AND_ASSIGN(MockTabModalConfirmDialogDelegate); 33 DISALLOW_COPY_AND_ASSIGN(MockTabModalConfirmDialogDelegate);
34 }; 34 };
35 35
36 TabModalConfirmDialogTest::TabModalConfirmDialogTest() 36 TabModalConfirmDialogTest::TabModalConfirmDialogTest()
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 EXPECT_CALL(*delegate_, OnCanceled()); 94 EXPECT_CALL(*delegate_, OnCanceled());
95 delegate_->Cancel(); 95 delegate_->Cancel();
96 } 96 }
97 97
98 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) { 98 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) {
99 EXPECT_CALL(*delegate_, OnCanceled()); 99 EXPECT_CALL(*delegate_, OnCanceled());
100 MessageLoopForUI::current()->PostTask(FROM_HERE, 100 MessageLoopForUI::current()->PostTask(FROM_HERE,
101 base::Bind(&BrowserList::AttemptExit)); 101 base::Bind(&BrowserList::AttemptExit));
102 ui_test_utils::RunMessageLoop(); 102 ui_test_utils::RunMessageLoop();
103 } 103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698