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

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

Issue 11571089: [Profiles, Fixit] Removing usage of GetDefaultProfile from chrome_frame code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebasing Created 7 years, 11 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
« no previous file with comments | « no previous file | 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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 process_singleton_->Lock(NULL); 771 process_singleton_->Lock(NULL);
772 return 0; 772 return 0;
773 } 773 }
774 774
775 bool CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback( 775 bool CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback(
776 const CommandLine& command_line, const FilePath& current_directory) { 776 const CommandLine& command_line, const FilePath& current_directory) {
777 std::string channel_id = command_line.GetSwitchValueASCII( 777 std::string channel_id = command_line.GetSwitchValueASCII(
778 switches::kAutomationClientChannelID); 778 switches::kAutomationClientChannelID);
779 EXPECT_FALSE(channel_id.empty()); 779 EXPECT_FALSE(channel_id.empty());
780 780
781 Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile( 781 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(
782 fake_chrome_->user_data()); 782 fake_chrome_->user_data());
783 783
784 AutomationProviderList* list = g_browser_process->GetAutomationProviderList(); 784 AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
785 DCHECK(list); 785 DCHECK(list);
786 list->AddProvider( 786 list->AddProvider(
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() {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 // content::InitializeSandboxInfo(&sandbox_info); 953 // content::InitializeSandboxInfo(&sandbox_info);
954 FakeMainDelegate delegate; 954 FakeMainDelegate delegate;
955 content::ContentMain( 955 content::ContentMain(
956 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 956 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
957 &sandbox_info, 957 &sandbox_info,
958 &delegate); 958 &delegate);
959 959
960 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 960 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
961 return g_test_suite->test_result(); 961 return g_test_suite->test_result();
962 } 962 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698