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

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

Issue 23620042: Revert 222689 "Use an X event loop in the GPU process on Linux." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 // to harness our tests so all threads use the same loop allowing us to 279 // to harness our tests so all threads use the same loop allowing us to
280 // guarantee all messages are processed.) By overriding the IsType method 280 // guarantee all messages are processed.) By overriding the IsType method
281 // we basically ignore the supplied message loop type, and instead infer 281 // we basically ignore the supplied message loop type, and instead infer
282 // our type based on the current thread. GO DEPENDENCY INJECTION! 282 // our type based on the current thread. GO DEPENDENCY INJECTION!
283 class TestMessageLoop : public base::MessageLoop { 283 class TestMessageLoop : public base::MessageLoop {
284 public: 284 public:
285 TestMessageLoop() : base::MessageLoop(base::MessageLoop::TYPE_DEFAULT) {} 285 TestMessageLoop() : base::MessageLoop(base::MessageLoop::TYPE_DEFAULT) {}
286 virtual ~TestMessageLoop() {} 286 virtual ~TestMessageLoop() {}
287 virtual bool IsType(base::MessageLoop::Type type) const OVERRIDE { 287 virtual bool IsType(base::MessageLoop::Type type) const OVERRIDE {
288 switch (type) { 288 switch (type) {
289 #if defined(TOOLKIT_GTK)
290 case base::MessageLoop::TYPE_GPU:
291 #endif
292 case base::MessageLoop::TYPE_UI: 289 case base::MessageLoop::TYPE_UI:
293 return BrowserThread::CurrentlyOn(BrowserThread::UI); 290 return BrowserThread::CurrentlyOn(BrowserThread::UI);
294 case base::MessageLoop::TYPE_IO: 291 case base::MessageLoop::TYPE_IO:
295 return BrowserThread::CurrentlyOn(BrowserThread::IO); 292 return BrowserThread::CurrentlyOn(BrowserThread::IO);
296 #if defined(OS_ANDROID) 293 #if defined(OS_ANDROID)
297 case base::MessageLoop::TYPE_JAVA: // fall-through 294 case base::MessageLoop::TYPE_JAVA: // fall-through
298 #endif // defined(OS_ANDROID) 295 #endif // defined(OS_ANDROID)
299 case base::MessageLoop::TYPE_DEFAULT: 296 case base::MessageLoop::TYPE_DEFAULT:
300 return !BrowserThread::CurrentlyOn(BrowserThread::UI) && 297 return !BrowserThread::CurrentlyOn(BrowserThread::UI) &&
301 !BrowserThread::CurrentlyOn(BrowserThread::IO); 298 !BrowserThread::CurrentlyOn(BrowserThread::IO);
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 919
923 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) { 920 TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestInstallDefaultHandler) {
924 RecreateRegistry(false); 921 RecreateRegistry(false);
925 registry()->AddPredefinedHandler(CreateProtocolHandler( 922 registry()->AddPredefinedHandler(CreateProtocolHandler(
926 "test", GURL("http://test.com/%s"), "Test")); 923 "test", GURL("http://test.com/%s"), "Test"));
927 registry()->InitProtocolSettings(); 924 registry()->InitProtocolSettings();
928 std::vector<std::string> protocols; 925 std::vector<std::string> protocols;
929 registry()->GetRegisteredProtocols(&protocols); 926 registry()->GetRegisteredProtocols(&protocols);
930 ASSERT_EQ(static_cast<size_t>(1), protocols.size()); 927 ASSERT_EQ(static_cast<size_t>(1), protocols.size());
931 } 928 }
OLDNEW
« no previous file with comments | « trunk/src/base/message_loop/message_pump_x11.cc ('k') | trunk/src/chrome/installer/linux/debian/expected_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698