chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc - Issue 16431004: Use a direct include of strings headers in chrome/browser/ui/a*/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

Issue 16431004: Use a direct include of strings headers in chrome/browser/ui/a*/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"	5 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"

6	6

7 #include "ash/launcher/launcher_types.h"	7 #include "ash/launcher/launcher_types.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/browser/ui/tabs/tab_strip_model.h"	11 #include "chrome/browser/ui/tabs/tab_strip_model.h"

12 #include "chrome/test/base/in_process_browser_test.h"	12 #include "chrome/test/base/in_process_browser_test.h"

13 #include "chrome/test/base/ui_test_utils.h"	13 #include "chrome/test/base/ui_test_utils.h"

14 #include "content/public/browser/web_contents.h"	14 #include "content/public/browser/web_contents.h"

15 #include "content/public/browser/web_contents_observer.h"	15 #include "content/public/browser/web_contents_observer.h"

16	16

17 using content::WebContents;	17 using content::WebContents;

18 using content::WebContentsObserver;	18 using content::WebContentsObserver;

19	19

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
179 EXPECT_TRUE(favicon_loader_->GetFavicon().empty());	179 EXPECT_TRUE(favicon_loader_->GetFavicon().empty());

180 ASSERT_NO_FATAL_FAILURE(ResetDownloads());	180 ASSERT_NO_FATAL_FAILURE(ResetDownloads());

181	181

182 ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));	182 ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));

183 ASSERT_TRUE(WaitForContentsLoaded());	183 ASSERT_TRUE(WaitForContentsLoaded());

184 EXPECT_TRUE(WaitForFaviconUpdated());	184 EXPECT_TRUE(WaitForFaviconUpdated());

185	185

186 EXPECT_FALSE(favicon_loader_->GetFavicon().empty());	186 EXPECT_FALSE(favicon_loader_->GetFavicon().empty());

187 EXPECT_EQ(128, favicon_loader_->GetFavicon().height());	187 EXPECT_EQ(128, favicon_loader_->GetFavicon().height());

188 }	188 }

OLD	NEW