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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 11415237: Move many ProcessSingleton methods to "protected" visibility as an upcoming refactoring of ProcessS… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux compile Created 8 years 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/process_singleton_linux_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 #include <Winsock2.h> 10 #include <Winsock2.h>
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 TestAutomationProvider::NewAutomationProvider(profile, channel_id, this)); 787 TestAutomationProvider::NewAutomationProvider(profile, channel_id, this));
788 return true; 788 return true;
789 } 789 }
790 790
791 void CFUrlRequestUnittestRunner::PreMainMessageLoopRun() { 791 void CFUrlRequestUnittestRunner::PreMainMessageLoopRun() {
792 fake_chrome_->InitializePostThreadsCreated(); 792 fake_chrome_->InitializePostThreadsCreated();
793 ProcessSingleton::NotificationCallback callback( 793 ProcessSingleton::NotificationCallback callback(
794 base::Bind( 794 base::Bind(
795 &CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback, 795 &CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback,
796 base::Unretained(this))); 796 base::Unretained(this)));
797 // Call Create directly instead of NotifyOtherProcessOrCreate as failure is
798 // prefered to notifying another process here.
797 if (!process_singleton_->Create(callback)) { 799 if (!process_singleton_->Create(callback)) {
798 LOG(FATAL) << "Failed to start up ProcessSingleton. Is another test " 800 LOG(FATAL) << "Failed to start up ProcessSingleton. Is another test "
799 << "executable or Chrome Frame running?"; 801 << "executable or Chrome Frame running?";
800 if (crash_service_) 802 if (crash_service_)
801 base::KillProcess(crash_service_, 0, false); 803 base::KillProcess(crash_service_, 0, false);
802 ::ExitProcess(1); 804 ::ExitProcess(1);
803 } 805 }
804 806
805 StartChromeFrameInHostBrowser(); 807 StartChromeFrameInHostBrowser();
806 } 808 }
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 // content::InitializeSandboxInfo(&sandbox_info); 953 // content::InitializeSandboxInfo(&sandbox_info);
952 FakeMainDelegate delegate; 954 FakeMainDelegate delegate;
953 content::ContentMain( 955 content::ContentMain(
954 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 956 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
955 &sandbox_info, 957 &sandbox_info,
956 &delegate); 958 &delegate);
957 959
958 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 960 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
959 return g_test_suite->test_result(); 961 return g_test_suite->test_result();
960 } 962 }
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_linux_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698