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

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

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused. Created 7 years, 1 month 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
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/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 const Extension* extension = 46 const Extension* extension =
47 content::Details<const InstalledExtensionInfo>(details)->extension; 47 content::Details<const InstalledExtensionInfo>(details)->extension;
48 if (extension->id() == expected_extension_id_) { 48 if (extension->id() == expected_extension_id_) {
49 installed_extension_ = extension; 49 installed_extension_ = extension;
50 base::MessageLoopForUI::current()->Quit(); 50 base::MessageLoopForUI::current()->Quit();
51 } 51 }
52 } 52 }
53 } 53 }
54 }; 54 };
55 55
56 #if defined(OS_CHROMEOS) 56 // TODO(samarth): delete along with rest of the NTP4 code.
57 // The Apps tab is not included in the new tab page in Chrome OS. 57 IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, DISABLED_Basic) {
58 #define MAYBE_Basic DISABLED_Basic
59 #else
60 #define MAYBE_Basic Basic
61 #endif
62
63 IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, MAYBE_Basic) {
64 #if defined(OS_WIN) && defined(USE_ASH) 58 #if defined(OS_WIN) && defined(USE_ASH)
65 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 59 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
66 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 60 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
67 return; 61 return;
68 #endif 62 #endif
69 63
70 browser()->profile()->GetExtensionService()->set_show_extensions_prompts( 64 browser()->profile()->GetExtensionService()->set_show_extensions_prompts(
71 false); 65 false);
72 66
73 content::NotificationRegistrar registrar; 67 content::NotificationRegistrar registrar;
(...skipping 18 matching lines...) Expand all
92 EXPECT_EQ("", installed_extension_->description()); 86 EXPECT_EQ("", installed_extension_->description());
93 EXPECT_EQ(GURL("http://www.example.com/"), 87 EXPECT_EQ(GURL("http://www.example.com/"),
94 AppLaunchInfo::GetLaunchWebURL(installed_extension_)); 88 AppLaunchInfo::GetLaunchWebURL(installed_extension_));
95 EXPECT_EQ(LAUNCH_TAB, 89 EXPECT_EQ(LAUNCH_TAB,
96 AppLaunchInfo::GetLaunchContainer(installed_extension_)); 90 AppLaunchInfo::GetLaunchContainer(installed_extension_));
97 EXPECT_EQ(0u, installed_extension_->GetActivePermissions()->apis().size()); 91 EXPECT_EQ(0u, installed_extension_->GetActivePermissions()->apis().size());
98 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size()); 92 EXPECT_EQ(0u, IconsInfo::GetIcons(installed_extension_).map().size());
99 } 93 }
100 94
101 } // namespace extensions 95 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698