chrome/browser/extensions/webstore_startup_installer_browsertest.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 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/chromeos/login/users/user_manager_impl.cc ('k') | chrome/browser/managed_mode/OWNERS » ('j') | no next file with comments »

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 "chrome/browser/chrome_notification_types.h"	6 #include "chrome/browser/chrome_notification_types.h"

7 #include "chrome/browser/extensions/extension_install_ui.h"	7 #include "chrome/browser/extensions/extension_install_ui.h"

8 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/extensions/startup_helper.h"	9 #include "chrome/browser/extensions/startup_helper.h"

10 #include "chrome/browser/extensions/webstore_installer_test.h"	10 #include "chrome/browser/extensions/webstore_installer_test.h"

11 #include "chrome/browser/infobars/infobar_service.h"	11 #include "chrome/browser/infobars/infobar_service.h"

12 #include "chrome/browser/managed_mode/managed_user_service.h"

13 #include "chrome/browser/managed_mode/managed_user_service_factory.h"

14 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/tabs/tab_strip_model.h"	14 #include "chrome/browser/ui/tabs/tab_strip_model.h"

17 #include "chrome/common/chrome_switches.h"	15 #include "chrome/common/chrome_switches.h"

18 #include "chrome/common/pref_names.h"	16 #include "chrome/common/pref_names.h"

19 #include "chrome/test/base/in_process_browser_test.h"	17 #include "chrome/test/base/in_process_browser_test.h"

20 #include "chrome/test/base/test_switches.h"	18 #include "chrome/test/base/test_switches.h"

21 #include "chrome/test/base/ui_test_utils.h"	19 #include "chrome/test/base/ui_test_utils.h"

22 #include "content/public/browser/notification_registrar.h"	20 #include "content/public/browser/notification_registrar.h"

23 #include "content/public/browser/notification_service.h"	21 #include "content/public/browser/notification_service.h"

(...skipping 302 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
326 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();	324 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

327 command_line->AppendSwitchASCII(	325 command_line->AppendSwitchASCII(

328 switches::kLimitedInstallFromWebstore, "2");	326 switches::kLimitedInstallFromWebstore, "2");

329 helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),	327 helper.LimitedInstallFromWebstore(*command_line, browser()->profile(),

330 base::MessageLoop::QuitWhenIdleClosure());	328 base::MessageLoop::QuitWhenIdleClosure());

331 base::MessageLoop::current()->Run();	329 base::MessageLoop::current()->Run();

332	330

333 EXPECT_TRUE(saw_install());	331 EXPECT_TRUE(saw_install());

334 EXPECT_EQ(0, browser_open_count());	332 EXPECT_EQ(0, browser_open_count());

335 }	333 }

OLD	NEW