OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 | 10 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 virtual MetricsService* metrics_service() { | 129 virtual MetricsService* metrics_service() { |
130 return NULL; | 130 return NULL; |
131 } | 131 } |
132 | 132 |
133 private: | 133 private: |
134 ScopedTempDir profiles_dir_; | 134 ScopedTempDir profiles_dir_; |
135 scoped_ptr<ProfileManager> profile_manager_; | 135 scoped_ptr<ProfileManager> profile_manager_; |
136 }; | 136 }; |
137 | 137 |
138 base::LazyInstance<chrome::ChromeContentClient> | 138 base::LazyInstance<chrome::ChromeContentClient> |
139 g_chrome_content_client(base::LINKER_INITIALIZED); | 139 g_chrome_content_client = LAZY_INSTANCE_INITIALIZER; |
140 | 140 |
141 // Override the default ContentBrowserClient to let Chrome participate in | 141 // Override the default ContentBrowserClient to let Chrome participate in |
142 // content logic. Must be done before any tabs are created. | 142 // content logic. Must be done before any tabs are created. |
143 base::LazyInstance<chrome::ChromeContentBrowserClient> | 143 base::LazyInstance<chrome::ChromeContentBrowserClient> |
144 g_browser_client(base::LINKER_INITIALIZED); | 144 g_browser_client = LAZY_INSTANCE_INITIALIZER; |
145 | 145 |
146 base::LazyInstance<chrome::ChromeContentRendererClient> | 146 base::LazyInstance<chrome::ChromeContentRendererClient> |
147 g_renderer_client(base::LINKER_INITIALIZED); | 147 g_renderer_client = LAZY_INSTANCE_INITIALIZER; |
148 | 148 |
149 } // namespace | 149 } // namespace |
150 | 150 |
151 | 151 |
152 class SupplyProxyCredentials : public WindowObserver { | 152 class SupplyProxyCredentials : public WindowObserver { |
153 public: | 153 public: |
154 SupplyProxyCredentials(const char* username, const char* password); | 154 SupplyProxyCredentials(const char* username, const char* password); |
155 | 155 |
156 protected: | 156 protected: |
157 struct DialogProps { | 157 struct DialogProps { |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
618 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); | 618 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); |
619 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); | 619 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); |
620 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which | 620 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which |
621 // check if globals are created and destroyed on the same thread don't fire. | 621 // check if globals are created and destroyed on the same thread don't fire. |
622 // Webkit global objects are created on the inproc renderer thread. | 622 // Webkit global objects are created on the inproc renderer thread. |
623 #if !defined(NDEBUG) | 623 #if !defined(NDEBUG) |
624 ExitProcess(test_suite.test_result()); | 624 ExitProcess(test_suite.test_result()); |
625 #endif // NDEBUG | 625 #endif // NDEBUG |
626 return test_suite.test_result(); | 626 return test_suite.test_result(); |
627 } | 627 } |
OLD | NEW |