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

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
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 "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" 5 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
11 #include "ash/common/shelf/shelf_constants.h" 11 #include "ash/shelf/shelf_constants.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "content/public/browser/web_contents_observer.h" 19 #include "content/public/browser/web_contents_observer.h"
20 #include "net/test/embedded_test_server/embedded_test_server.h" 20 #include "net/test/embedded_test_server/embedded_test_server.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 EXPECT_TRUE(favicon_loader_->GetFavicon().empty()); 180 EXPECT_TRUE(favicon_loader_->GetFavicon().empty());
181 ASSERT_NO_FATAL_FAILURE(ResetDownloads()); 181 ASSERT_NO_FATAL_FAILURE(ResetDownloads());
182 182
183 ASSERT_TRUE(NavigateTo("launcher-largefavicon.html")); 183 ASSERT_TRUE(NavigateTo("launcher-largefavicon.html"));
184 ASSERT_TRUE(WaitForContentsLoaded()); 184 ASSERT_TRUE(WaitForContentsLoaded());
185 EXPECT_TRUE(WaitForFaviconUpdated()); 185 EXPECT_TRUE(WaitForFaviconUpdated());
186 186
187 EXPECT_FALSE(favicon_loader_->GetFavicon().empty()); 187 EXPECT_FALSE(favicon_loader_->GetFavicon().empty());
188 EXPECT_EQ(128, favicon_loader_->GetFavicon().height()); 188 EXPECT_EQ(128, favicon_loader_->GetFavicon().height());
189 } 189 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698