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

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

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 12 matching lines...) Expand all
23 #include "net/test/embedded_test_server/embedded_test_server.h" 23 #include "net/test/embedded_test_server/embedded_test_server.h"
24 24
25 using content::NavigationController; 25 using content::NavigationController;
26 using content::WebContents; 26 using content::WebContents;
27 27
28 namespace { 28 namespace {
29 29
30 class ProcessManagementTest : public ExtensionBrowserTest { 30 class ProcessManagementTest : public ExtensionBrowserTest {
31 private: 31 private:
32 // This is needed for testing isolated apps, which are still experimental. 32 // This is needed for testing isolated apps, which are still experimental.
33 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 33 virtual void SetUpCommandLine(CommandLine* command_line) override {
34 ExtensionBrowserTest::SetUpCommandLine(command_line); 34 ExtensionBrowserTest::SetUpCommandLine(command_line);
35 command_line->AppendSwitch( 35 command_line->AppendSwitch(
36 extensions::switches::kEnableExperimentalExtensionApis); 36 extensions::switches::kEnableExperimentalExtensionApis);
37 } 37 }
38 }; 38 };
39 39
40 } // namespace 40 } // namespace
41 41
42 42
43 // TODO(nasko): crbug.com/173137 43 // TODO(nasko): crbug.com/173137
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 } 241 }
242 242
243 // We've loaded 5 extensions with background pages, 1 extension without 243 // We've loaded 5 extensions with background pages, 1 extension without
244 // background page, and one isolated app. We expect only 2 unique processes 244 // background page, and one isolated app. We expect only 2 unique processes
245 // hosting those extensions. 245 // hosting those extensions.
246 extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile); 246 extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile);
247 247
248 EXPECT_GE((size_t) 6, process_map->size()); 248 EXPECT_GE((size_t) 6, process_map->size());
249 EXPECT_EQ((size_t) 2, process_ids.size()); 249 EXPECT_EQ((size_t) 2, process_ids.size());
250 } 250 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/policy_handlers.h ('k') | chrome/browser/extensions/proxy_overridden_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698