Port some unit tests in chrome/browser/

This first requires http://codereview.chromium.org/8618 .

Only snippet_unittest is enabled for build. For rest of files
it's only a platform cleanup.

Review URL: http://codereview.chromium.org/8191
Patch from Paweł Hajdan jr.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5488 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 18 deletions

diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc
index 7507536..c8ad456 100644
--- a/chrome/browser/history/thumbnail_database_unittest.cc
+++ b/chrome/browser/history/thumbnail_database_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <windows.h>
-
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -35,16 +33,15 @@ class ThumbnailDatabaseTest : public testing::Test {
   virtual void SetUp() {
     // get an empty file for the test DB
     PathService::Get(chrome::DIR_TEST_DATA, &file_name_);
-    file_name_.push_back(file_util::kPathSeparator);
-    file_name_.append(L"TestThumbnails.db");
-    DeleteFile(file_name_.c_str());
+    file_util::AppendToPath(&file_name_, L"TestThumbnails.db");
+    file_util::Delete(file_name_, false);
 
     google_bitmap_.reset(
         JPEGCodec::Decode(kGoogleThumbnail, sizeof(kGoogleThumbnail)));
   }
 
   virtual void TearDown() {
-    DeleteFile(file_name_.c_str());
+    file_util::Delete(file_name_, false);
   }
 
   scoped_ptr<SkBitmap> google_bitmap_;
@@ -64,17 +61,7 @@ const double kWorseBoringness = 0.50;
 const double kBetterBoringness = 0.10;
 const double kTotallyBoring = 1.0;
 
-const __int64 kPage1 = 1234;
-
-// converts out constant data above to a vector for SetPageThumbnail
-static std::vector<unsigned char> StringToVector(const unsigned char* str) {
-  size_t len = strlen(reinterpret_cast<const char*>(str));
-  std::vector<unsigned char> vect;
-  vect.resize(len);
-
-  memcpy(&vect[0], str, len);
-  return vect;
-}
+const int64 kPage1 = 1234;
 
 }  // namespace
 
@@ -93,7 +80,7 @@ TEST_F(ThumbnailDatabaseTest, AddDelete) {
   ASSERT_TRUE(boring.Equals(score_output));
 
   // Verify a random page is not found.
-  __int64 page2 = 5678;
+  int64 page2 = 5678;
   std::vector<unsigned char> jpeg_data;
   EXPECT_FALSE(db.GetPageThumbnail(page2, &jpeg_data));
   EXPECT_FALSE(db.ThumbnailScoreForId(page2, &score_output));