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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
10 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 // do here: navigate with the PAGE_TRANSITION_FROM_ADDRESS_BAR flag, | 38 // do here: navigate with the PAGE_TRANSITION_FROM_ADDRESS_BAR flag, |
39 // without waiting for the navigation. It would be painful to change | 39 // without waiting for the navigation. It would be painful to change |
40 // either of the NavigateToURL entry points to support these two | 40 // either of the NavigateToURL entry points to support these two |
41 // constraints, so we use chrome::Navigate directly. | 41 // constraints, so we use chrome::Navigate directly. |
42 chrome::NavigateParams params( | 42 chrome::NavigateParams params( |
43 browser, | 43 browser, |
44 GURL(content::kChromeUIGpuCrashURL), | 44 GURL(content::kChromeUIGpuCrashURL), |
45 ui::PageTransitionFromInt( | 45 ui::PageTransitionFromInt( |
46 ui::PAGE_TRANSITION_TYPED | | 46 ui::PAGE_TRANSITION_TYPED | |
47 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); | 47 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)); |
48 params.disposition = NEW_BACKGROUND_TAB; | 48 params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB; |
49 chrome::Navigate(¶ms); | 49 chrome::Navigate(¶ms); |
50 } | 50 } |
51 | 51 |
52 } // namespace | 52 } // namespace |
53 | 53 |
54 class WebGLInfoBarTest : public InProcessBrowserTest { | 54 class WebGLInfoBarTest : public InProcessBrowserTest { |
55 protected: | 55 protected: |
56 void SetUpInProcessBrowserTestFixture() override { | 56 void SetUpInProcessBrowserTestFixture() override { |
57 base::FilePath test_dir; | 57 base::FilePath test_dir; |
58 ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); | 58 ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 // The page should reload and another message sent to the | 128 // The page should reload and another message sent to the |
129 // DomAutomationController. | 129 // DomAutomationController. |
130 m.clear(); | 130 m.clear(); |
131 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 131 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
132 EXPECT_EQ("\"LOADED\"", m); | 132 EXPECT_EQ("\"LOADED\"", m); |
133 } | 133 } |
134 | 134 |
135 // There isn't any point in adding a test which calls Accept() on the | 135 // There isn't any point in adding a test which calls Accept() on the |
136 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 136 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
137 // there's no concrete event that could be observed in response. | 137 // there's no concrete event that could be observed in response. |
OLD | NEW |