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

Side by Side Diff: chrome/browser/extensions/api/management/management_api_unittest.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "chrome/browser/extensions/extension_function_test_utils.h" 6 #include "chrome/browser/extensions/extension_function_test_utils.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_service_test_base.h" 8 #include "chrome/browser/extensions/extension_service_test_base.h"
9 #include "chrome/browser/extensions/test_extension_system.h" 9 #include "chrome/browser/extensions/test_extension_system.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/host_desktop.h"
12 #include "chrome/test/base/test_browser_window.h" 11 #include "chrome/test/base/test_browser_window.h"
13 #include "extensions/browser/api/management/management_api.h" 12 #include "extensions/browser/api/management/management_api.h"
14 #include "extensions/browser/api/management/management_api_constants.h" 13 #include "extensions/browser/api/management/management_api_constants.h"
15 #include "extensions/browser/event_router_factory.h" 14 #include "extensions/browser/event_router_factory.h"
16 #include "extensions/browser/extension_dialog_auto_confirm.h" 15 #include "extensions/browser/extension_dialog_auto_confirm.h"
17 #include "extensions/browser/extension_prefs.h" 16 #include "extensions/browser/extension_prefs.h"
18 #include "extensions/browser/extension_registry.h" 17 #include "extensions/browser/extension_registry.h"
19 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
20 #include "extensions/browser/management_policy.h" 19 #include "extensions/browser/management_policy.h"
21 #include "extensions/browser/test_management_policy.h" 20 #include "extensions/browser/test_management_policy.h"
22 #include "extensions/common/error_utils.h" 21 #include "extensions/common/error_utils.h"
23 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
24 #include "extensions/common/extension_set.h" 23 #include "extensions/common/extension_set.h"
25 #include "extensions/common/test_util.h" 24 #include "extensions/common/test_util.h"
25 #include "ui/gfx/host_desktop_type.h"
26 26
27 namespace extensions { 27 namespace extensions {
28 28
29 namespace { 29 namespace {
30 30
31 scoped_ptr<KeyedService> BuildManagementApi(content::BrowserContext* context) { 31 scoped_ptr<KeyedService> BuildManagementApi(content::BrowserContext* context) {
32 return make_scoped_ptr(new ManagementAPI(context)); 32 return make_scoped_ptr(new ManagementAPI(context));
33 } 33 }
34 34
35 scoped_ptr<KeyedService> BuildEventRouter(content::BrowserContext* profile) { 35 scoped_ptr<KeyedService> BuildEventRouter(content::BrowserContext* profile) {
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 function = new ManagementUninstallSelfFunction(); 218 function = new ManagementUninstallSelfFunction();
219 function->set_extension(extension); 219 function->set_extension(extension);
220 EXPECT_TRUE(registry()->enabled_extensions().Contains(extension_id)); 220 EXPECT_TRUE(registry()->enabled_extensions().Contains(extension_id));
221 EXPECT_TRUE(RunFunction(function, uninstall_args)) << function->GetError(); 221 EXPECT_TRUE(RunFunction(function, uninstall_args)) << function->GetError();
222 EXPECT_FALSE(registry()->GetExtensionById(extension_id, 222 EXPECT_FALSE(registry()->GetExtensionById(extension_id,
223 ExtensionRegistry::EVERYTHING)); 223 ExtensionRegistry::EVERYTHING));
224 } 224 }
225 } 225 }
226 226
227 } // namespace extensions 227 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698