chrome/browser/media_galleries/media_galleries_preferences_unittest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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/media_galleries/media_galleries_preferences_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (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/media_galleries/media_galleries_preferences.cc ('k') | chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc » ('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 // MediaGalleriesPreferences unit tests.	5 // MediaGalleriesPreferences unit tests.

6	6

7 #include "chrome/browser/media_galleries/media_galleries_preferences.h"	7 #include "chrome/browser/media_galleries/media_galleries_preferences.h"

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

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

12 #include "base/message_loop.h"	12 #include "base/message_loop.h"

13 #include "base/utf_string_conversions.h"	13 #include "base/strings/utf_string_conversions.h"

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "chrome/browser/extensions/extension_system.h"	15 #include "chrome/browser/extensions/extension_system.h"

16 #include "chrome/browser/extensions/test_extension_system.h"	16 #include "chrome/browser/extensions/test_extension_system.h"

17 #include "chrome/browser/media_galleries/media_file_system_registry.h"	17 #include "chrome/browser/media_galleries/media_file_system_registry.h"

18 #include "chrome/browser/media_galleries/media_galleries_test_util.h"	18 #include "chrome/browser/media_galleries/media_galleries_test_util.h"

19 #include "chrome/browser/storage_monitor/media_storage_util.h"	19 #include "chrome/browser/storage_monitor/media_storage_util.h"

20 #include "chrome/browser/storage_monitor/storage_monitor.h"	20 #include "chrome/browser/storage_monitor/storage_monitor.h"

21 #include "chrome/browser/storage_monitor/test_storage_monitor.h"	21 #include "chrome/browser/storage_monitor/test_storage_monitor.h"

22 #include "chrome/common/extensions/background_info.h"	22 #include "chrome/common/extensions/background_info.h"

23 #include "chrome/common/extensions/extension.h"	23 #include "chrome/common/extensions/extension.h"

(...skipping 688 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
712 // Remove a user added gallery and it should go away.	712 // Remove a user added gallery and it should go away.

713 gallery_prefs()->ForgetGalleryById(user_added_id);	713 gallery_prefs()->ForgetGalleryById(user_added_id);

714 expected_galleries_.erase(user_added_id);	714 expected_galleries_.erase(user_added_id);

715 expected_device_map[info.device_id()].erase(user_added_id);	715 expected_device_map[info.device_id()].erase(user_added_id);

716	716

717 EXPECT_EQ(2, observer1.notifications());	717 EXPECT_EQ(2, observer1.notifications());

718 EXPECT_EQ(3, observer2.notifications());	718 EXPECT_EQ(3, observer2.notifications());

719 }	719 }

720	720

721 } // namespace chrome	721 } // namespace chrome

OLD	NEW