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

Side by Side Diff: chrome/browser/extensions/extension_managed_mode_apitest.cc

Issue 10542023: Disable modifying extensions when in managed mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed Evan's nits Created 8 years, 6 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/managed_mode.h" 5 #include "chrome/browser/managed_mode.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/ui/browser.h"
7 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
8 #include "chrome/common/extensions/extension.h" 9 #include "chrome/common/extensions/extension.h"
9 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
10 11
11 // Tests enabling and querying managed mode. 12 // Tests enabling and querying managed mode.
12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ManagedModeGetAndEnable) { 13 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ManagedModeGetAndEnable) {
13 ASSERT_FALSE(ManagedMode::IsInManagedMode()); 14 ASSERT_FALSE(ManagedMode::IsInManagedMode());
14 15
15 ASSERT_TRUE(RunComponentExtensionTest("managed_mode/get_enter")) << message_; 16 ASSERT_TRUE(RunComponentExtensionTest("managed_mode/get_enter")) << message_;
16 17
(...skipping 13 matching lines...) Expand all
30 ASSERT_TRUE(extension) << "Failed to load extension."; 31 ASSERT_TRUE(extension) << "Failed to load extension.";
31 32
32 ResultCatcher catcher; 33 ResultCatcher catcher;
33 // Tell the test what values for the |onChange| event to expect. 34 // Tell the test what values for the |onChange| event to expect.
34 std::string page_url = "test.html?expect=true,false"; 35 std::string page_url = "test.html?expect=true,false";
35 ui_test_utils::NavigateToURL(browser(), 36 ui_test_utils::NavigateToURL(browser(),
36 extension->GetResourceURL(page_url)); 37 extension->GetResourceURL(page_url));
37 38
38 // Fire the extension event when entering managed mode. We directly call 39 // Fire the extension event when entering managed mode. We directly call
39 // SetInManagedMode() to bypass any confirmation dialogs etc. 40 // SetInManagedMode() to bypass any confirmation dialogs etc.
40 ManagedMode::GetInstance()->SetInManagedMode(true); 41 ManagedMode::GetInstance()->SetInManagedMode(browser()->profile());
41 42
42 // Fire the extension event when leaving managed mode. 43 // Fire the extension event when leaving managed mode.
43 ManagedMode::GetInstance()->SetInManagedMode(false); 44 ManagedMode::GetInstance()->SetInManagedMode(NULL);
44 45
45 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 46 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
46 } 47 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698