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

Side by Side Diff: chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

Issue 808253006: Remove the GoogleURLTracker infobar functionality entirely. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 5 years, 11 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
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/google/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 5
6 #include <vector> 6 #include <vector>
7 7
8 #include "ash/desktop_background/desktop_background_controller.h" 8 #include "ash/desktop_background/desktop_background_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "chrome/browser/chromeos/customization/customization_document.h" 14 #include "chrome/browser/chromeos/customization/customization_document.h"
15 #include "chrome/browser/chromeos/customization/customization_wallpaper_download er.h" 15 #include "chrome/browser/chromeos/customization/customization_wallpaper_download er.h"
16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h" 17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h"
18 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
19 #include "chrome/test/base/testing_browser_process.h" 19 #include "chrome/test/base/testing_browser_process.h"
20 #include "chromeos/chromeos_switches.h" 20 #include "chromeos/chromeos_switches.h"
21 #include "components/google/core/browser/google_url_tracker.h"
22 #include "net/http/http_response_headers.h" 21 #include "net/http/http_response_headers.h"
23 #include "net/http/http_status_code.h" 22 #include "net/http/http_status_code.h"
24 #include "net/url_request/test_url_fetcher_factory.h" 23 #include "net/url_request/test_url_fetcher_factory.h"
25 #include "net/url_request/url_fetcher_impl.h" 24 #include "net/url_request/url_fetcher_impl.h"
26 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
27 26
28 namespace chromeos { 27 namespace chromeos {
29 28
30 namespace { 29 namespace {
31 30
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 310
312 observer.WaitForWallpaperAnimationFinished(); 311 observer.WaitForWallpaperAnimationFinished();
313 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( 312 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
314 controller_->GetWallpaper(), 313 controller_->GetWallpaper(),
315 wallpaper_manager_test_utils::kCustomWallpaperColor)); 314 wallpaper_manager_test_utils::kCustomWallpaperColor));
316 315
317 EXPECT_EQ(2U, url_factory.num_attempts()); 316 EXPECT_EQ(2U, url_factory.num_attempts());
318 } 317 }
319 318
320 } // namespace chromeos 319 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/google/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698