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

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

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/toolbar/browser_actions_container.h" 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
9 #include "chrome/browser/extensions/browser_action_test_util.h" 9 #include "chrome/browser/extensions/browser_action_test_util.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"
12 #include "content/public/test/test_utils.h" 11 #include "content/public/test/test_utils.h"
12 #include "extensions/browser/extension_prefs.h"
13 13
14 using extensions::Extension; 14 using extensions::Extension;
15 15
16 class BrowserActionsContainerTest : public ExtensionBrowserTest { 16 class BrowserActionsContainerTest : public ExtensionBrowserTest {
17 public: 17 public:
18 BrowserActionsContainerTest() { 18 BrowserActionsContainerTest() {
19 } 19 }
20 virtual ~BrowserActionsContainerTest() {} 20 virtual ~BrowserActionsContainerTest() {}
21 21
22 virtual void SetUpOnMainThread() OVERRIDE { 22 virtual void SetUpOnMainThread() OVERRIDE {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") 174 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
175 .AppendASCII("browser_action") 175 .AppendASCII("browser_action")
176 .AppendASCII("basics"))); 176 .AppendASCII("basics")));
177 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); 177 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
178 EnsureExtensionHasIcon(0); 178 EnsureExtensionHasIcon(0);
179 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); 179 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
180 std::string idA = browser_actions_bar()->GetExtensionId(0); 180 std::string idA = browser_actions_bar()->GetExtensionId(0);
181 181
182 // Force hide this browser action. 182 // Force hide this browser action.
183 extensions::ExtensionActionAPI::SetBrowserActionVisibility( 183 extensions::ExtensionActionAPI::SetBrowserActionVisibility(
184 extensions::ExtensionSystem::Get(browser()->profile())-> 184 extensions::ExtensionPrefs::Get(browser()->profile()), idA, false);
185 extension_service()->extension_prefs(),
186 idA,
187 false);
188 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); 185 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
189 } 186 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698