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

Side by Side Diff: chrome/browser/media_galleries/media_file_system_registry_unittest.cc

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 // MediaFileSystemRegistry unit tests. 5 // MediaFileSystemRegistry unit tests.
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/extensions/test_extension_system.h" 27 #include "chrome/browser/extensions/test_extension_system.h"
28 #include "chrome/browser/media_galleries/media_file_system_context.h" 28 #include "chrome/browser/media_galleries/media_file_system_context.h"
29 #include "chrome/browser/media_galleries/media_file_system_registry.h" 29 #include "chrome/browser/media_galleries/media_file_system_registry.h"
30 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h" 30 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
31 #include "chrome/browser/media_galleries/media_galleries_test_util.h" 31 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
32 #include "chrome/browser/storage_monitor/removable_device_constants.h" 32 #include "chrome/browser/storage_monitor/removable_device_constants.h"
33 #include "chrome/browser/storage_monitor/storage_info.h" 33 #include "chrome/browser/storage_monitor/storage_info.h"
34 #include "chrome/browser/storage_monitor/storage_monitor.h" 34 #include "chrome/browser/storage_monitor/storage_monitor.h"
35 #include "chrome/browser/storage_monitor/test_storage_monitor.h" 35 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
36 #include "chrome/common/chrome_paths.h" 36 #include "chrome/common/chrome_paths.h"
37 #include "chrome/common/extensions/extension.h"
38 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 37 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
39 #include "chrome/test/base/testing_browser_process.h" 38 #include "chrome/test/base/testing_browser_process.h"
40 #include "chrome/test/base/testing_profile.h" 39 #include "chrome/test/base/testing_profile.h"
41 #include "content/public/browser/render_process_host.h" 40 #include "content/public/browser/render_process_host.h"
42 #include "content/public/browser/render_process_host_factory.h" 41 #include "content/public/browser/render_process_host_factory.h"
43 #include "content/public/browser/render_view_host.h" 42 #include "content/public/browser/render_view_host.h"
44 #include "content/public/browser/web_contents.h" 43 #include "content/public/browser/web_contents.h"
45 #include "content/public/test/mock_render_process_host.h" 44 #include "content/public/test/mock_render_process_host.h"
46 #include "content/public/test/test_browser_thread.h" 45 #include "content/public/test/test_browser_thread.h"
47 #include "content/public/test/web_contents_tester.h" 46 #include "content/public/test/web_contents_tester.h"
47 #include "extensions/common/extension.h"
48 #include "sync/api/string_ordinal.h" 48 #include "sync/api/string_ordinal.h"
49 #include "testing/gtest/include/gtest/gtest.h" 49 #include "testing/gtest/include/gtest/gtest.h"
50 50
51 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
52 #include "chrome/browser/chromeos/login/user_manager.h" 52 #include "chrome/browser/chromeos/login/user_manager.h"
53 #include "chrome/browser/chromeos/settings/cros_settings.h" 53 #include "chrome/browser/chromeos/settings/cros_settings.h"
54 #include "chrome/browser/chromeos/settings/device_settings_service.h" 54 #include "chrome/browser/chromeos/settings/device_settings_service.h"
55 #endif 55 #endif
56 56
57 using content::BrowserThread; 57 using content::BrowserThread;
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName()); 1050 profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName());
1051 #else 1051 #else
1052 profile_state->AddNameForAllCompare(path.LossyDisplayName()); 1052 profile_state->AddNameForAllCompare(path.LossyDisplayName());
1053 #endif 1053 #endif
1054 1054
1055 profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries); 1055 profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries);
1056 } else { 1056 } else {
1057 profile_state->CheckGalleries("names", one_expectation, one_expectation); 1057 profile_state->CheckGalleries("names", one_expectation, one_expectation);
1058 } 1058 }
1059 } 1059 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698