| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/pickle.h" | 7 #include "base/pickle.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" | 10 #include "third_party/WebKit/public/platform/WebHTTPBody.h" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" | 11 #include "third_party/WebKit/public/platform/WebPoint.h" |
| 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" | 12 #include "third_party/WebKit/public/platform/WebVector.h" |
| 13 #include "ui/gfx/screen.h" | 13 #include "ui/gfx/screen.h" |
| 14 #include "webkit/base/file_path_string_conversions.h" | 14 #include "webkit/base/file_path_string_conversions.h" |
| 15 #include "webkit/glue/glue_serialize.h" | 15 #include "webkit/glue/glue_serialize.h" |
| 16 #include "webkit/glue/web_io_operators.h" | 16 #include "webkit/glue/web_io_operators.h" |
| 17 | 17 |
| 18 using WebKit::WebData; | 18 using WebKit::WebData; |
| 19 using WebKit::WebHistoryItem; | 19 using WebKit::WebHistoryItem; |
| 20 using WebKit::WebHTTPBody; | 20 using WebKit::WebHTTPBody; |
| 21 using WebKit::WebPoint; | 21 using WebKit::WebPoint; |
| 22 using WebKit::WebString; | 22 using WebKit::WebString; |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 | 320 |
| 321 ASSERT_FALSE(item1.isNull()); | 321 ASSERT_FALSE(item1.isNull()); |
| 322 ASSERT_FALSE(item2.isNull()); | 322 ASSERT_FALSE(item2.isNull()); |
| 323 | 323 |
| 324 // Form data was not removed. | 324 // Form data was not removed. |
| 325 HistoryItemExpectEqual(item1, item2, | 325 HistoryItemExpectEqual(item1, item2, |
| 326 webkit_glue::HistoryItemCurrentVersion()); | 326 webkit_glue::HistoryItemCurrentVersion()); |
| 327 } | 327 } |
| 328 | 328 |
| 329 } // namespace | 329 } // namespace |
| OLD | NEW |