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 "chrome/browser/ui/views/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/browser_actions_container.h" |
6 | 6 |
7 #include "chrome/browser/extensions/browser_action_test_util.h" | 7 #include "chrome/browser/extensions/browser_action_test_util.h" |
8 #include "chrome/browser/extensions/extension_action.h" | 8 #include "chrome/browser/extensions/extension_action.h" |
9 #include "chrome/browser/extensions/extension_action_manager.h" | 9 #include "chrome/browser/extensions/extension_action_manager.h" |
10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
| 12 #include "chrome/browser/extensions/extension_system.h" |
12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/common/chrome_notification_types.h" | 15 #include "chrome/common/chrome_notification_types.h" |
15 #include "chrome/common/extensions/extension_constants.h" | 16 #include "chrome/common/extensions/extension_constants.h" |
16 #include "chrome/common/extensions/extension_icon_set.h" | 17 #include "chrome/common/extensions/extension_icon_set.h" |
17 #include "chrome/common/extensions/extension_resource.h" | 18 #include "chrome/common/extensions/extension_resource.h" |
18 #include "content/public/test/test_utils.h" | 19 #include "content/public/test/test_utils.h" |
19 | 20 |
20 using extensions::Extension; | 21 using extensions::Extension; |
21 | 22 |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 // Load extension A (contains browser action). | 234 // Load extension A (contains browser action). |
234 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") | 235 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") |
235 .AppendASCII("browser_action") | 236 .AppendASCII("browser_action") |
236 .AppendASCII("basics"))); | 237 .AppendASCII("basics"))); |
237 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); | 238 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); |
238 EnsureExtensionHasIcon(0); | 239 EnsureExtensionHasIcon(0); |
239 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); | 240 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); |
240 std::string idA = browser_actions_bar()->GetExtensionId(0); | 241 std::string idA = browser_actions_bar()->GetExtensionId(0); |
241 | 242 |
242 // Force hide this browser action. | 243 // Force hide this browser action. |
243 ExtensionService* service = browser()->profile()->GetExtensionService(); | 244 ExtensionService* service = extensions::ExtensionSystem::Get( |
| 245 browser()->profile())->extension_service(); |
244 service->extension_prefs()->SetBrowserActionVisibility( | 246 service->extension_prefs()->SetBrowserActionVisibility( |
245 service->GetExtensionById(idA, false), false); | 247 service->GetExtensionById(idA, false), false); |
246 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); | 248 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); |
247 } | 249 } |
248 | 250 |
249 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) { | 251 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) { |
250 LOG(INFO) << "Test starting\n" << std::flush; | 252 LOG(INFO) << "Test starting\n" << std::flush; |
251 | 253 |
252 LOG(INFO) << "Loading extension\n" << std::flush; | 254 LOG(INFO) << "Loading extension\n" << std::flush; |
253 | 255 |
(...skipping 25 matching lines...) Expand all Loading... |
279 ExtensionIconSet::MATCH_EXACTLY); | 281 ExtensionIconSet::MATCH_EXACTLY); |
280 | 282 |
281 extension->SetCachedImage(extension->GetResource(path), bitmap, size); | 283 extension->SetCachedImage(extension->GetResource(path), bitmap, size); |
282 | 284 |
283 LOG(INFO) << "Disabling extension\n" << std::flush; | 285 LOG(INFO) << "Disabling extension\n" << std::flush; |
284 DisableExtension(extension->id()); | 286 DisableExtension(extension->id()); |
285 LOG(INFO) << "Enabling extension\n" << std::flush; | 287 LOG(INFO) << "Enabling extension\n" << std::flush; |
286 EnableExtension(extension->id()); | 288 EnableExtension(extension->id()); |
287 LOG(INFO) << "Test ending\n" << std::flush; | 289 LOG(INFO) << "Test ending\n" << std::flush; |
288 } | 290 } |
OLD | NEW |