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

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

Issue 23903024: Enable device discovery notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « chrome/common/chrome_switches.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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); 516 NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
517 DCHECK(res_mod); 517 DCHECK(res_mod);
518 _AtlBaseModule.SetResourceInstance(res_mod); 518 _AtlBaseModule.SetResourceInstance(res_mod);
519 519
520 // Point the ResourceBundle at chrome.dll. 520 // Point the ResourceBundle at chrome.dll.
521 ui::SetResourcesDataDLL(_AtlBaseModule.GetResourceInstance()); 521 ui::SetResourcesDataDLL(_AtlBaseModule.GetResourceInstance());
522 522
523 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 523 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
524 524
525 CommandLine* cmd = CommandLine::ForCurrentProcess(); 525 CommandLine* cmd = CommandLine::ForCurrentProcess();
526 // Disable Device Discovery with switch because this test does not respect
527 // BrowserContextKeyedBaseFactory::ServiceIsNULLWhileTesting.
528 cmd->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
526 cmd->AppendSwitch(switches::kDisableWebResources); 529 cmd->AppendSwitch(switches::kDisableWebResources);
527 cmd->AppendSwitch(switches::kSingleProcess); 530 cmd->AppendSwitch(switches::kSingleProcess);
528 531
529 base::FilePath local_state_path; 532 base::FilePath local_state_path;
530 CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path)); 533 CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
531 scoped_refptr<base::SequencedTaskRunner> local_state_task_runner = 534 scoped_refptr<base::SequencedTaskRunner> local_state_task_runner =
532 JsonPrefStore::GetTaskRunnerForFile(local_state_path, 535 JsonPrefStore::GetTaskRunnerForFile(local_state_path,
533 BrowserThread::GetBlockingPool()); 536 BrowserThread::GetBlockingPool());
534 browser_process_.reset(new FakeBrowserProcessImpl(local_state_task_runner, 537 browser_process_.reset(new FakeBrowserProcessImpl(local_state_task_runner,
535 *cmd)); 538 *cmd));
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 content::InitializeSandboxInfo(&sandbox_info); 995 content::InitializeSandboxInfo(&sandbox_info);
993 FakeMainDelegate delegate; 996 FakeMainDelegate delegate;
994 content::ContentMain( 997 content::ContentMain(
995 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)), 998 reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
996 &sandbox_info, 999 &sandbox_info,
997 &delegate); 1000 &delegate);
998 1001
999 // Note: In debug builds, we ExitProcess during PostDestroyThreads. 1002 // Note: In debug builds, we ExitProcess during PostDestroyThreads.
1000 return g_test_suite->test_result(); 1003 return g_test_suite->test_result();
1001 } 1004 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698