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