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

Side by Side Diff: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

Issue 1148293006: Rename service/service_factory of file_system_provider and launcher_search_provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lsp Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/file_manager/volume_manager.h" 5 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h" 14 #include "chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h"
15 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h" 15 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
16 #include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system .h" 16 #include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system .h"
17 #include "chrome/browser/chromeos/file_system_provider/service.h" 17 #include "chrome/browser/chromeos/file_system_provider/file_system_provider_serv ice.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
20 #include "chromeos/dbus/fake_power_manager_client.h" 20 #include "chromeos/dbus/fake_power_manager_client.h"
21 #include "chromeos/disks/disk_mount_manager.h" 21 #include "chromeos/disks/disk_mount_manager.h"
22 #include "components/storage_monitor/storage_info.h" 22 #include "components/storage_monitor/storage_info.h"
23 #include "content/public/test/test_browser_thread_bundle.h" 23 #include "content/public/test/test_browser_thread_bundle.h"
24 #include "extensions/browser/extension_registry.h" 24 #include "extensions/browser/extension_registry.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 26
27 namespace file_manager { 27 namespace file_manager {
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 // Detach 861 // Detach
862 volume_manager()->OnRemovableStorageDetached(info); 862 volume_manager()->OnRemovableStorageDetached(info);
863 ASSERT_EQ(2u, observer.events().size()); 863 ASSERT_EQ(2u, observer.events().size());
864 EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, 864 EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED,
865 observer.events()[1].type); 865 observer.events()[1].type);
866 866
867 EXPECT_FALSE(volume.get()); 867 EXPECT_FALSE(volume.get());
868 } 868 }
869 869
870 } // namespace file_manager 870 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698