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

Side by Side Diff: chrome/browser/ui/views/browser_actions_container_browsertest.cc

Issue 5730004: Rename ExtensionsService to ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions/browser_action_test_util.h" 5 #include "chrome/browser/extensions/browser_action_test_util.h"
6 #include "chrome/browser/extensions/extension_browsertest.h" 6 #include "chrome/browser/extensions/extension_browsertest.h"
7 #include "chrome/browser/extensions/extensions_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/views/browser_actions_container.h" 10 #include "chrome/browser/views/browser_actions_container.h"
11 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/extensions/extension_action.h" 12 #include "chrome/common/extensions/extension_action.h"
13 #include "chrome/common/extensions/extension_resource.h" 13 #include "chrome/common/extensions/extension_resource.h"
14 14
15 class BrowserActionsContainerTest : public ExtensionBrowserTest { 15 class BrowserActionsContainerTest : public ExtensionBrowserTest {
16 public: 16 public:
17 BrowserActionsContainerTest() : browser_(NULL) { 17 BrowserActionsContainerTest() : browser_(NULL) {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 // Load extension A (contains browser action). 222 // Load extension A (contains browser action).
223 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") 223 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
224 .AppendASCII("browser_action") 224 .AppendASCII("browser_action")
225 .AppendASCII("basics"))); 225 .AppendASCII("basics")));
226 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); 226 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
227 EnsureExtensionHasIcon(0); 227 EnsureExtensionHasIcon(0);
228 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); 228 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
229 std::string idA = browser_actions_bar()->GetExtensionId(0); 229 std::string idA = browser_actions_bar()->GetExtensionId(0);
230 230
231 // Force hide this browser action. 231 // Force hide this browser action.
232 ExtensionsService* service = browser()->profile()->GetExtensionsService(); 232 ExtensionService* service = browser()->profile()->GetExtensionService();
233 service->SetBrowserActionVisibility(service->GetExtensionById(idA, false), 233 service->SetBrowserActionVisibility(service->GetExtensionById(idA, false),
234 false); 234 false);
235 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); 235 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
236 236
237 ReloadExtension(idA); 237 ReloadExtension(idA);
238 238
239 // The browser action should become visible again. 239 // The browser action should become visible again.
240 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); 240 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
241 } 241 }
242 242
243 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) { 243 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, TestCrash57536) {
244 LOG(INFO) << "Test starting\n" << std::flush; 244 LOG(INFO) << "Test starting\n" << std::flush;
245 245
246 ExtensionsService* service = browser()->profile()->GetExtensionsService(); 246 ExtensionService* service = browser()->profile()->GetExtensionService();
247 const size_t size_before = service->extensions()->size(); 247 const size_t size_before = service->extensions()->size();
248 248
249 LOG(INFO) << "Loading extension\n" << std::flush; 249 LOG(INFO) << "Loading extension\n" << std::flush;
250 250
251 // Load extension A (contains browser action). 251 // Load extension A (contains browser action).
252 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") 252 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
253 .AppendASCII("browser_action") 253 .AppendASCII("browser_action")
254 .AppendASCII("crash_57536"))); 254 .AppendASCII("crash_57536")));
255 255
256 const Extension* extension = service->extensions()->at(size_before); 256 const Extension* extension = service->extensions()->at(size_before);
(...skipping 15 matching lines...) Expand all
272 extension->GetResource(extension->browser_action()->default_icon_path()), 272 extension->GetResource(extension->browser_action()->default_icon_path()),
273 bitmap, 273 bitmap,
274 size); 274 size);
275 275
276 LOG(INFO) << "Disabling extension\n" << std::flush; 276 LOG(INFO) << "Disabling extension\n" << std::flush;
277 DisableExtension(extension->id()); 277 DisableExtension(extension->id());
278 LOG(INFO) << "Enabling extension\n" << std::flush; 278 LOG(INFO) << "Enabling extension\n" << std::flush;
279 EnableExtension(extension->id()); 279 EnableExtension(extension->id());
280 LOG(INFO) << "Test ending\n" << std::flush; 280 LOG(INFO) << "Test ending\n" << std::flush;
281 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698