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

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

Issue 1644773003: Remove BrowserIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host-desktop-1
Patch Set: . Created 4 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
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 <map> 5 #include <map>
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_util.h" 11 #include "chrome/browser/extensions/extension_util.h"
12 #include "chrome/browser/extensions/launch_util.h" 12 #include "chrome/browser/extensions/launch_util.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_commands.h" 15 #include "chrome/browser/ui/browser_commands.h"
16 #include "chrome/browser/ui/browser_finder.h" 16 #include "chrome/browser/ui/browser_finder.h"
17 #include "chrome/browser/ui/browser_iterator.h" 17 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/extensions/extension_constants.h" 20 #include "chrome/common/extensions/extension_constants.h"
21 #include "content/public/test/test_utils.h" 21 #include "content/public/test/test_utils.h"
22 #include "extensions/browser/api/management/management_api.h" 22 #include "extensions/browser/api/management/management_api.h"
23 #include "extensions/browser/extension_dialog_auto_confirm.h" 23 #include "extensions/browser/extension_dialog_auto_confirm.h"
24 #include "extensions/browser/extension_system.h" 24 #include "extensions/browser/extension_system.h"
25 #include "extensions/browser/test_management_policy.h" 25 #include "extensions/browser/test_management_policy.h"
26 #include "extensions/common/manifest.h" 26 #include "extensions/common/manifest.h"
27 #include "extensions/test/extension_test_message_listener.h" 27 #include "extensions/test/extension_test_message_listener.h"
28 28
29 using extensions::Extension; 29 using extensions::Extension;
30 using extensions::Manifest; 30 using extensions::Manifest;
31 31
32 namespace { 32 namespace {
33 33
34 // Find a browser other than |browser|. 34 // Find a browser other than |browser|.
35 Browser* FindOtherBrowser(Browser* browser) { 35 Browser* FindOtherBrowser(Browser* browser) {
36 Browser* found = NULL; 36 Browser* found = NULL;
37 for (chrome::BrowserIterator it; !it.done(); it.Next()) { 37 for (auto* b : *BrowserList::GetInstance()) {
38 if (*it == browser) 38 if (b == browser)
39 continue; 39 continue;
40 found = *it; 40 found = b;
41 } 41 }
42 return found; 42 return found;
43 } 43 }
44 44
45 } // namespace 45 } // namespace
46 46
47 class ExtensionManagementApiTest : public ExtensionApiTest { 47 class ExtensionManagementApiTest : public ExtensionApiTest {
48 public: 48 public:
49 void SetUpCommandLine(base::CommandLine* command_line) override { 49 void SetUpCommandLine(base::CommandLine* command_line) override {
50 ExtensionApiTest::SetUpCommandLine(command_line); 50 ExtensionApiTest::SetUpCommandLine(command_line);
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 } 336 }
337 } 337 }
338 338
339 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { 339 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) {
340 LoadExtensions(); 340 LoadExtensions();
341 base::FilePath basedir = test_data_dir_.AppendASCII("management"); 341 base::FilePath basedir = test_data_dir_.AppendASCII("management");
342 LoadNamedExtension(basedir, "packaged_app"); 342 LoadNamedExtension(basedir, "packaged_app");
343 343
344 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); 344 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html"));
345 } 345 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698