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

Unified Diff: chrome/browser/web_applications/web_app_unittest.cc

Issue 1038573002: Fixed thread-unsafe use of gfx::Image in app shortcut creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 8 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/web_applications/web_app_unittest.cc
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index 13359e77976ca28c0c68659c7ad573302f752845..f9cac1e901438a1a89a3d4ab443f7371ab23c7c3 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/web_applications/web_app.h"
#include "base/files/file_path.h"
+#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/web_applications/web_app.h"
@@ -43,12 +44,12 @@ TEST_F(WebApplicationTest, GetShortcutInfoForTab) {
RenderViewHostTester::TestOnMessageReceived(
rvh(), ChromeViewHostMsg_DidGetWebApplicationInfo(0, web_app_info));
- web_app::ShortcutInfo info;
- web_app::GetShortcutInfoForTab(web_contents(), &info);
+ scoped_ptr<web_app::ShortcutInfo> info =
+ web_app::GetShortcutInfoForTab(web_contents());
- EXPECT_EQ(title, info.title);
- EXPECT_EQ(description, info.description);
- EXPECT_EQ(url, info.url);
+ EXPECT_EQ(title, info->title);
+ EXPECT_EQ(description, info->description);
+ EXPECT_EQ(url, info->url);
}
#endif
« no previous file with comments | « chrome/browser/web_applications/web_app_mac_unittest.mm ('k') | chrome/browser/web_applications/web_app_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698