| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <exdisp.h> | 7 #include <exdisp.h> |
| 8 | 8 |
| 9 #include "app/app_paths.h" | 9 #include "app/app_paths.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // The gears plugin causes the PluginRequestInterceptor to kick in and it | 98 // The gears plugin causes the PluginRequestInterceptor to kick in and it |
| 99 // will cause problems when it tries to intercept URL requests. | 99 // will cause problems when it tries to intercept URL requests. |
| 100 PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath()); | 100 PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath()); |
| 101 | 101 |
| 102 icu_util::Initialize(); | 102 icu_util::Initialize(); |
| 103 | 103 |
| 104 chrome::RegisterPathProvider(); | 104 chrome::RegisterPathProvider(); |
| 105 app::RegisterPathProvider(); | 105 app::RegisterPathProvider(); |
| 106 | 106 |
| 107 ResourceBundle::InitSharedInstance(L"en-US"); | 107 ResourceBundle::InitSharedInstance(L"en-US"); |
| 108 ResourceBundle::GetSharedInstance().LoadThemeResources(); | |
| 109 | 108 |
| 110 const CommandLine* cmd = CommandLine::ForCurrentProcess(); | 109 const CommandLine* cmd = CommandLine::ForCurrentProcess(); |
| 111 browser_process_.reset(new BrowserProcessImpl(*cmd)); | 110 browser_process_.reset(new BrowserProcessImpl(*cmd)); |
| 112 RenderProcessHost::set_run_renderer_in_process(true); | 111 RenderProcessHost::set_run_renderer_in_process(true); |
| 113 // BrowserProcessImpl's constructor should set g_browser_process. | 112 // BrowserProcessImpl's constructor should set g_browser_process. |
| 114 DCHECK(g_browser_process); | 113 DCHECK(g_browser_process); |
| 115 | 114 |
| 116 Profile* profile = g_browser_process->profile_manager()-> | 115 Profile* profile = g_browser_process->profile_manager()-> |
| 117 GetDefaultProfile(FilePath(user_data())); | 116 GetDefaultProfile(FilePath(user_data())); |
| 118 PrefService* prefs = profile->GetPrefs(); | 117 PrefService* prefs = profile->GetPrefs(); |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 DialogWatchdog watchdog; | 383 DialogWatchdog watchdog; |
| 385 // See url_request_unittest.cc for these credentials. | 384 // See url_request_unittest.cc for these credentials. |
| 386 SupplyProxyCredentials credentials("user", "secret"); | 385 SupplyProxyCredentials credentials("user", "secret"); |
| 387 watchdog.AddObserver(&credentials); | 386 watchdog.AddObserver(&credentials); |
| 388 testing::InitGoogleTest(&argc, argv); | 387 testing::InitGoogleTest(&argc, argv); |
| 389 FilterDisabledTests(); | 388 FilterDisabledTests(); |
| 390 CFUrlRequestUnittestRunner test_suite(argc, argv); | 389 CFUrlRequestUnittestRunner test_suite(argc, argv); |
| 391 test_suite.RunMainUIThread(); | 390 test_suite.RunMainUIThread(); |
| 392 return 0; | 391 return 0; |
| 393 } | 392 } |
| OLD | NEW |