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

Side by Side Diff: chrome/browser/chromeos/login/ui/simple_web_view_dialog_browsertest.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/chromeos/login/login_manager_test.h" 8 #include "chrome/browser/chromeos/login/login_manager_test.h"
9 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h" 9 #include "chrome/browser/chromeos/login/ui/captive_portal_view.h"
10 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" 10 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 } // namespace 49 } // namespace
50 50
51 class SimpleWebViewDialogTest : public LoginManagerTest { 51 class SimpleWebViewDialogTest : public LoginManagerTest {
52 public: 52 public:
53 SimpleWebViewDialogTest(): LoginManagerTest(false) {} 53 SimpleWebViewDialogTest(): LoginManagerTest(false) {}
54 ~SimpleWebViewDialogTest() override {} 54 ~SimpleWebViewDialogTest() override {}
55 55
56 InterstitialPageDelegate* CreateDelegate(CaptivePortalWindowProxy* proxy) { 56 InterstitialPageDelegate* CreateDelegate(CaptivePortalWindowProxy* proxy) {
57 SimpleWebViewDialog* dialog = proxy->captive_portal_view_for_testing(); 57 SimpleWebViewDialog* dialog = proxy->captive_portal_view_for_testing();
58 CHECK(dialog) << "CaptivePortalView is not initialized"; 58 // CaptivePortalView is not initialized
59 CHECK(dialog);
59 return new InterstitialPageDelegate(dialog->web_view_->web_contents()); 60 return new InterstitialPageDelegate(dialog->web_view_->web_contents());
60 } 61 }
61 62
62 private: 63 private:
63 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialogTest); 64 DISALLOW_COPY_AND_ASSIGN(SimpleWebViewDialogTest);
64 }; 65 };
65 66
66 IN_PROC_BROWSER_TEST_F(SimpleWebViewDialogTest, Interstitial) { 67 IN_PROC_BROWSER_TEST_F(SimpleWebViewDialogTest, Interstitial) {
67 content::WebContents* web_contents = 68 content::WebContents* web_contents =
68 LoginDisplayHost::default_host()->GetWebUILoginView()->GetWebContents(); 69 LoginDisplayHost::default_host()->GetWebUILoginView()->GetWebContents();
69 StubDelegate delegate; 70 StubDelegate delegate;
70 CaptivePortalWindowProxy proxy(&delegate, web_contents); 71 CaptivePortalWindowProxy proxy(&delegate, web_contents);
71 proxy.Show(); 72 proxy.Show();
72 73
73 // Delegate creates a page and passes himself to it. Page owns the 74 // Delegate creates a page and passes himself to it. Page owns the
74 // delegate and will be destroyed by the end of the test. 75 // delegate and will be destroyed by the end of the test.
75 CreateDelegate(&proxy); 76 CreateDelegate(&proxy);
76 } 77 }
77 78
78 } // namespace chromeos 79 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698