| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shlobj.h> | 8 #include <shlobj.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #elif defined(USE_NSS) | |
| 11 #include "base/nss_util.h" | |
| 12 #endif | 10 #endif |
| 13 | 11 |
| 14 #include <algorithm> | 12 #include <algorithm> |
| 15 #include <string> | 13 #include <string> |
| 16 | 14 |
| 17 #include "base/file_util.h" | 15 #include "base/file_util.h" |
| 18 #include "base/format_macros.h" | 16 #include "base/format_macros.h" |
| 19 #include "base/message_loop.h" | 17 #include "base/message_loop.h" |
| 20 #include "base/path_service.h" | 18 #include "base/path_service.h" |
| 21 #include "base/process_util.h" | 19 #include "base/process_util.h" |
| (...skipping 2841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2863 req.SetExtraRequestHeaders(headers); | 2861 req.SetExtraRequestHeaders(headers); |
| 2864 req.Start(); | 2862 req.Start(); |
| 2865 MessageLoop::current()->Run(); | 2863 MessageLoop::current()->Run(); |
| 2866 // If the net tests are being run with ChromeFrame then we need to allow for | 2864 // If the net tests are being run with ChromeFrame then we need to allow for |
| 2867 // the 'chromeframe' suffix which is added to the user agent before the | 2865 // the 'chromeframe' suffix which is added to the user agent before the |
| 2868 // closing parentheses. | 2866 // closing parentheses. |
| 2869 EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true)); | 2867 EXPECT_TRUE(StartsWithASCII(d.data_received(), "Lynx (textmode", true)); |
| 2870 } | 2868 } |
| 2871 | 2869 |
| 2872 } // namespace net | 2870 } // namespace net |
| OLD | NEW |