| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/autocomplete/autocomplete.h" | 9 #include "chrome/browser/autocomplete/autocomplete.h" |
| 9 #include "chrome/browser/autocomplete/history_contents_provider.h" | 10 #include "chrome/browser/autocomplete/history_contents_provider.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #include "chrome/browser/chrome_thread.h" | 12 #include "chrome/browser/chrome_thread.h" |
| 11 #include "chrome/browser/history/history.h" | 13 #include "chrome/browser/history/history.h" |
| 12 #include "chrome/test/testing_profile.h" | 14 #include "chrome/test/testing_profile.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 16 |
| 15 using base::Time; | 17 using base::Time; |
| 16 using base::TimeDelta; | 18 using base::TimeDelta; |
| 17 | 19 |
| 18 namespace { | 20 namespace { |
| 19 | 21 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 ASSERT_EQ(2U, m3.size()); | 183 ASSERT_EQ(2U, m3.size()); |
| 182 if (bookmark_url == m3[0].destination_url) { | 184 if (bookmark_url == m3[0].destination_url) { |
| 183 EXPECT_EQ("http://www.google.com/3", m3[1].destination_url.spec()); | 185 EXPECT_EQ("http://www.google.com/3", m3[1].destination_url.spec()); |
| 184 } else { | 186 } else { |
| 185 EXPECT_EQ(bookmark_url, m3[1].destination_url); | 187 EXPECT_EQ(bookmark_url, m3[1].destination_url); |
| 186 EXPECT_EQ("http://www.google.com/3", m3[0].destination_url.spec()); | 188 EXPECT_EQ("http://www.google.com/3", m3[0].destination_url.spec()); |
| 187 } | 189 } |
| 188 } | 190 } |
| 189 | 191 |
| 190 } // namespace | 192 } // namespace |
| OLD | NEW |