| 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 <windows.h> | 5 #include <windows.h> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 using base::TimeDelta; | 21 using base::TimeDelta; |
| 22 | 22 |
| 23 class WebDatabaseTest : public testing::Test { | 23 class WebDatabaseTest : public testing::Test { |
| 24 protected: | 24 protected: |
| 25 | 25 |
| 26 virtual void SetUp() { | 26 virtual void SetUp() { |
| 27 wchar_t b[32]; | 27 wchar_t b[32]; |
| 28 _itow_s(static_cast<int>(GetTickCount()), b, arraysize(b), 10); | 28 _itow_s(static_cast<int>(GetTickCount()), b, arraysize(b), 10); |
| 29 | 29 |
| 30 PathService::Get(chrome::DIR_TEST_DATA, &file_); | 30 PathService::Get(chrome::DIR_TEST_DATA, &file_); |
| 31 file_ += file_util::kPathSeparator; | 31 file_ += FilePath::kSeparators[0]; |
| 32 file_ += L"TestWebDatabase"; | 32 file_ += L"TestWebDatabase"; |
| 33 file_ += b; | 33 file_ += b; |
| 34 file_ += L".db"; | 34 file_ += L".db"; |
| 35 DeleteFile(file_.c_str()); | 35 DeleteFile(file_.c_str()); |
| 36 } | 36 } |
| 37 | 37 |
| 38 virtual void TearDown() { | 38 virtual void TearDown() { |
| 39 DeleteFile(file_.c_str()); | 39 DeleteFile(file_.c_str()); |
| 40 } | 40 } |
| 41 | 41 |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 ASSERT_EQ(32, images[1].width()); | 649 ASSERT_EQ(32, images[1].width()); |
| 650 ASSERT_EQ(32, images[1].height()); | 650 ASSERT_EQ(32, images[1].height()); |
| 651 } else { | 651 } else { |
| 652 ASSERT_EQ(32, images[0].width()); | 652 ASSERT_EQ(32, images[0].width()); |
| 653 ASSERT_EQ(32, images[0].height()); | 653 ASSERT_EQ(32, images[0].height()); |
| 654 ASSERT_EQ(16, images[1].width()); | 654 ASSERT_EQ(16, images[1].width()); |
| 655 ASSERT_EQ(16, images[1].height()); | 655 ASSERT_EQ(16, images[1].height()); |
| 656 } | 656 } |
| 657 } | 657 } |
| 658 | 658 |
| OLD | NEW |