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

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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
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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/ref_counted_memory.h" 9 #include "base/memory/ref_counted_memory.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/prefs/pref_service.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 13 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
13 #include "chrome/browser/chromeos/login/default_user_images.h" 14 #include "chrome/browser/chromeos/login/default_user_images.h"
14 #include "chrome/browser/chromeos/login/mock_user_manager.h" 15 #include "chrome/browser/chromeos/login/mock_user_manager.h"
15 #include "chrome/browser/chromeos/login/user_image_manager_impl.h" 16 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
16 #include "chrome/browser/chromeos/login/user_manager.h" 17 #include "chrome/browser/chromeos/login/user_manager.h"
17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/prefs/scoped_user_pref_update.h" 18 #include "chrome/browser/prefs/scoped_user_pref_update.h"
19 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/test/base/testing_browser_process.h" 22 #include "chrome/test/base/testing_browser_process.h"
23 #include "content/public/browser/notification_observer.h" 23 #include "content/public/browser/notification_observer.h"
24 #include "content/public/browser/notification_registrar.h" 24 #include "content/public/browser/notification_registrar.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/test/test_utils.h" 26 #include "content/public/test/test_utils.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 const User* user = UserManager::Get()->FindUser(kTestUser1); 256 const User* user = UserManager::Get()->FindUser(kTestUser1);
257 ASSERT_TRUE(user); 257 ASSERT_TRUE(user);
258 EXPECT_TRUE(user->image_is_safe_format()); 258 EXPECT_TRUE(user->image_is_safe_format());
259 // Check image dimensions. Images can't be compared since JPEG is lossy. 259 // Check image dimensions. Images can't be compared since JPEG is lossy.
260 const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex); 260 const gfx::ImageSkia& saved_image = GetDefaultImage(kFirstDefaultImageIndex);
261 EXPECT_EQ(saved_image.width(), user->image().width()); 261 EXPECT_EQ(saved_image.width(), user->image().width());
262 EXPECT_EQ(saved_image.height(), user->image().height()); 262 EXPECT_EQ(saved_image.height(), user->image().height());
263 } 263 }
264 264
265 } // namespace chromeos 265 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/terms_of_service_screen.cc ('k') | chrome/browser/chromeos/login/user_image_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698