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

Unified Diff: chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot to update tests Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
index aafb5c1df30858c0d1666e0e05db055a3bbbf148..62e39095c01593fc3c35eaf1419813fa7d0fea54 100644
--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/extensions/browser_event_router.h"
+#include "chrome/browser/extensions/extension_action_icon_factory.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_util.h"
@@ -71,10 +72,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
ASSERT_TRUE(catcher.GetNextResult());
}
+ // We should not be creating icons asynchronoulsy, so we don't need an
Jeffrey Yasskin 2012/09/17 20:18:39 sp: asynchronoulsy
tbarzic 2012/09/17 22:06:10 Done.
+ // observer.
+ ExtensionActionIconFactory icon_factory(extension, action, NULL);
+
// Test that we received the changes.
tab_id = SessionTabHelper::FromWebContents(
chrome::GetActiveWebContents(browser()))->session_id().id();
- EXPECT_FALSE(action->GetIcon(tab_id).IsEmpty());
+ EXPECT_FALSE(icon_factory.GetIcon(tab_id).IsEmpty());
}
// Test that calling chrome.pageAction.setPopup() can enable a popup.

Powered by Google App Engine
This is Rietveld 408576698