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

Side by Side Diff: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. 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 "chrome/browser/custom_handlers/protocol_handler_registry.h" 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/synchronization/waitable_event.h" 11 #include "base/synchronization/waitable_event.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/prefs/pref_registry_syncable.h"
14 #include "chrome/browser/prefs/pref_service_syncable.h"
13 #include "chrome/common/chrome_notification_types.h" 15 #include "chrome/common/chrome_notification_types.h"
14 #include "chrome/common/custom_handlers/protocol_handler.h" 16 #include "chrome/common/custom_handlers/protocol_handler.h"
15 #include "chrome/test/base/testing_browser_process.h" 17 #include "chrome/test/base/testing_browser_process.h"
16 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
17 #include "content/public/browser/notification_observer.h" 19 #include "content/public/browser/notification_observer.h"
18 #include "content/public/browser/notification_registrar.h" 20 #include "content/public/browser/notification_registrar.h"
19 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
20 #include "content/public/test/test_browser_thread.h" 22 #include "content/public/test/test_browser_thread.h"
21 #include "content/public/test/test_renderer_host.h" 23 #include "content/public/test/test_renderer_host.h"
22 #include "net/url_request/url_request.h" 24 #include "net/url_request/url_request.h"
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 934
933 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) { 935 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) {
934 RecreateRegistry(false); 936 RecreateRegistry(false);
935 registry()->AddPredefinedHandler(CreateProtocolHandler( 937 registry()->AddPredefinedHandler(CreateProtocolHandler(
936 "test", GURL("http://test.com/%s"), "Test")); 938 "test", GURL("http://test.com/%s"), "Test"));
937 registry()->InitProtocolSettings(); 939 registry()->InitProtocolSettings();
938 std::vector<std::string> protocols; 940 std::vector<std::string> protocols;
939 registry()->GetRegisteredProtocols(&protocols); 941 registry()->GetRegisteredProtocols(&protocols);
940 ASSERT_EQ(static_cast<size_t>(1), protocols.size()); 942 ASSERT_EQ(static_cast<size_t>(1), protocols.size());
941 } 943 }
OLDNEW
« no previous file with comments | « chrome/browser/custom_handlers/protocol_handler_registry.cc ('k') | chrome/browser/devtools/devtools_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698