Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/common/json_value_serializer_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 164 matching lines @@
   delete root_expected;
 }
 
 namespace {
 
 void ValidateJsonList(const std::string& json) {
   Value* root = NULL;
   ASSERT_TRUE(JSONReader::Read(json, &root, false));
   ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root);
-  ASSERT_EQ(1, list->GetSize());
+  ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   int value = 0;
   ASSERT_TRUE(elt && elt->GetAsInteger(&value));
   ASSERT_EQ(1, value);
   delete root;
 }
 
 }  // namespace
 
 TEST(JSONValueSerializerTest, JSONReaderComments) {
   ValidateJsonList("[ // 2, 3, ignore me ] \n1 ]");
   ValidateJsonList("[ /* 2, \n3, ignore me ]*/ \n1 ]");
   ValidateJsonList("//header\n[ // 2, \n// 3, \n1 ]// footer");
   ValidateJsonList("/*\n[ // 2, \n// 3, \n1 ]*/[1]");
   ValidateJsonList("[ 1 /* one */ ] /* end */");
   ValidateJsonList("[ 1 //// ,2\r\n ]");
 
   Value* root = NULL;
   // It's ok to have a comment in a string.
   ASSERT_TRUE(JSONReader::Read("[\"// ok\\n /* foo */ \"]", &root, false));
   ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root);
-  ASSERT_EQ(1, list->GetSize());
+  ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   std::wstring value;
   ASSERT_TRUE(elt && elt->GetAsString(&value));
   ASSERT_EQ(L"// ok\n /* foo */ ", value);
   delete root;
 
   root = NULL;
   // You can't nest comments.
   ASSERT_FALSE(JSONReader::Read("/* /* inner */ outer */ [ 1 ]", &root, false));
 
   // Not a open comment token.
   ASSERT_FALSE(JSONReader::Read("/ * * / [1]", &root, false));
 }
 
 namespace {
   class JSONFileValueSerializerTest : public testing::Test {
   protected:
     virtual void SetUp() {
       // Name a subdirectory of the temp directory.
       ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
       file_util::AppendToPath(&test_dir_, L"JSONFileValueSerializerTest");
 
       // Create a fresh, empty copy of this directory.
       file_util::Delete(test_dir_, true);
-      CreateDirectory(test_dir_.c_str(), NULL);
+      file_util::CreateDirectory(test_dir_);
     }
     virtual void TearDown() {
       // Clean up test directory
       ASSERT_TRUE(file_util::Delete(test_dir_, false));
       ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
     // the path to temporary directory used to contain the test operations
     std::wstring test_dir_;
   };
 }  // anonymous namespace
 
+// TODO(port): Enable these when PathService::Get with DIR_TEST_DATA is ported.
+#if defined(OS_WIN)
 TEST_F(JSONFileValueSerializerTest, Roundtrip) {
   std::wstring original_file_path;
   ASSERT_TRUE(
     PathService::Get(chrome::DIR_TEST_DATA, &original_file_path));
   file_util::AppendToPath(&original_file_path, L"serializer_test.js");
 
   ASSERT_TRUE(file_util::PathExists(original_file_path));
 
   JSONFileValueSerializer deserializer(original_file_path);
   Value* root;
@@ skipping 70 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path));
   file_util::AppendToPath(&source_file_path,
                           L"serializer_test_nowhitespace.js");
   ASSERT_TRUE(file_util::PathExists(source_file_path));
   JSONFileValueSerializer serializer(source_file_path);
   Value* root;
   ASSERT_TRUE(serializer.Deserialize(&root));
   ASSERT_TRUE(root);
   delete root;
 }
-
+#endif  // defined(OS_WIN)