| 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 "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
| 10 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_commands.h" | 12 #include "chrome/browser/ui/browser_commands.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 13 #include "chrome/browser/ui/browser_navigator.h" |
| 13 #include "chrome/browser/ui/browser_navigator_params.h" | 14 #include "chrome/browser/ui/browser_navigator_params.h" |
| 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 15 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
| 16 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // The page should reload and another message sent to the | 143 // The page should reload and another message sent to the |
| 143 // DomAutomationController. | 144 // DomAutomationController. |
| 144 m.clear(); | 145 m.clear(); |
| 145 ASSERT_TRUE(message_queue.WaitForMessage(&m)); | 146 ASSERT_TRUE(message_queue.WaitForMessage(&m)); |
| 146 EXPECT_EQ("\"LOADED\"", m); | 147 EXPECT_EQ("\"LOADED\"", m); |
| 147 } | 148 } |
| 148 | 149 |
| 149 // There isn't any point in adding a test which calls Accept() on the | 150 // There isn't any point in adding a test which calls Accept() on the |
| 150 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and | 151 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and |
| 151 // there's no concrete event that could be observed in response. | 152 // there's no concrete event that could be observed in response. |
| OLD | NEW |