| OLD | NEW |
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1157 | 1157 |
| 1158 tab->NavigateToURL(net::FilePathToFileURL(filename)); | 1158 tab->NavigateToURL(net::FilePathToFileURL(filename)); |
| 1159 | 1159 |
| 1160 // Allow some time for the popup to show up and close. | 1160 // Allow some time for the popup to show up and close. |
| 1161 PlatformThread::Sleep(2000); | 1161 PlatformThread::Sleep(2000); |
| 1162 | 1162 |
| 1163 std::wstring expected(L"string"); | 1163 std::wstring expected(L"string"); |
| 1164 std::wstring jscript = CreateJSString(L"\"" + expected + L"\""); | 1164 std::wstring jscript = CreateJSString(L"\"" + expected + L"\""); |
| 1165 std::wstring actual; | 1165 std::wstring actual; |
| 1166 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual)); | 1166 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", jscript, &actual)); |
| 1167 ASSERT_STREQ(expected.c_str(), actual.c_str()); | 1167 ASSERT_EQ(expected, actual); |
| 1168 } | 1168 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 99203:
Second attempt at cleaning up handling of --disable-popup-blocking. I didn't... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/