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

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

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 base::MessageLoopForUI::current()->Quit(); 53 base::MessageLoopForUI::current()->Quit();
54 } 54 }
55 } 55 }
56 } 56 }
57 }; 57 };
58 58
59 // TODO(samarth): delete along with rest of the NTP4 code. 59 // TODO(samarth): delete along with rest of the NTP4 code.
60 IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, DISABLED_Basic) { 60 IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, DISABLED_Basic) {
61 #if defined(OS_WIN) && defined(USE_ASH) 61 #if defined(OS_WIN) && defined(USE_ASH)
62 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 62 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
63 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 63 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
64 switches::kAshBrowserTests))
64 return; 65 return;
65 #endif 66 #endif
66 67
67 ExtensionService* service = 68 ExtensionService* service =
68 ExtensionSystem::Get(browser()->profile())->extension_service(); 69 ExtensionSystem::Get(browser()->profile())->extension_service();
69 service->set_show_extensions_prompts(false); 70 service->set_show_extensions_prompts(false);
70 71
71 content::NotificationRegistrar registrar; 72 content::NotificationRegistrar registrar;
72 registrar.Add(this, 73 registrar.Add(this,
73 extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED, 74 extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
(...skipping 21 matching lines...) Expand all
95 AppLaunchInfo::GetLaunchContainer(installed_extension_)); 96 AppLaunchInfo::GetLaunchContainer(installed_extension_));
96 EXPECT_EQ(0u, 97 EXPECT_EQ(0u,
97 installed_extension_->permissions_data() 98 installed_extension_->permissions_data()
98 ->active_permissions() 99 ->active_permissions()
99 ->apis() 100 ->apis()
100 .size()); 101 .size());
101 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size()); 102 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size());
102 } 103 }
103 104
104 } // namespace extensions 105 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/crx_installer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698