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

Side by Side Diff: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

Issue 1967773004: Fix include path for moved thread_task_runner_handle.h header in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393013 Created 4 years, 7 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 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 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 5 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/files/file_util.h" 17 #include "base/files/file_util.h"
18 #include "base/json/json_writer.h" 18 #include "base/json/json_writer.h"
19 #include "base/macros.h" 19 #include "base/macros.h"
20 #include "base/memory/linked_ptr.h" 20 #include "base/memory/linked_ptr.h"
21 #include "base/memory/ref_counted.h" 21 #include "base/memory/ref_counted.h"
22 #include "base/memory/ref_counted_memory.h" 22 #include "base/memory/ref_counted_memory.h"
23 #include "base/path_service.h" 23 #include "base/path_service.h"
24 #include "base/run_loop.h" 24 #include "base/run_loop.h"
25 #include "base/thread_task_runner_handle.h" 25 #include "base/threading/thread_task_runner_handle.h"
26 #include "base/time/time.h" 26 #include "base/time/time.h"
27 #include "base/values.h" 27 #include "base/values.h"
28 #include "chrome/browser/browser_process.h" 28 #include "chrome/browser/browser_process.h"
29 #include "chrome/browser/chrome_notification_types.h" 29 #include "chrome/browser/chrome_notification_types.h"
30 #include "chrome/browser/chromeos/login/login_manager_test.h" 30 #include "chrome/browser/chromeos/login/login_manager_test.h"
31 #include "chrome/browser/chromeos/login/startup_utils.h" 31 #include "chrome/browser/chromeos/login/startup_utils.h"
32 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" 32 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
33 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h" 33 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h"
34 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 34 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
35 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h" 35 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im ages.h"
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 saved_image = 816 saved_image =
817 test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load(); 817 test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
818 ASSERT_TRUE(saved_image); 818 ASSERT_TRUE(saved_image);
819 819
820 // Check image dimensions. Images can't be compared since JPEG is lossy. 820 // Check image dimensions. Images can't be compared since JPEG is lossy.
821 EXPECT_EQ(policy_image_->width(), saved_image->width()); 821 EXPECT_EQ(policy_image_->width(), saved_image->width());
822 EXPECT_EQ(policy_image_->height(), saved_image->height()); 822 EXPECT_EQ(policy_image_->height(), saved_image->height());
823 } 823 }
824 824
825 } // namespace chromeos 825 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698