Add more tests to unit_tests on Linux, and some platform cleanups.

Review URL: http://codereview.chromium.org/17277

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

6 files changed, 70 insertions, 54 deletions

diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index c630bbd..8e3b95d 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -23,14 +23,13 @@ class UserScriptMasterTest : public testing::Test,
 
   virtual void SetUp() {
     // Name a subdirectory of the temp directory.
-    std::wstring path_str;
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_str));
-    script_dir_ = FilePath(path_str).Append(
-        FILE_PATH_LITERAL("UserScriptTest"));
+    FilePath tmp_dir;
+    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &tmp_dir));
+    script_dir_ = tmp_dir.Append(FILE_PATH_LITERAL("UserScriptTest"));
 
     // Create a fresh, empty copy of this directory.
-    file_util::Delete(script_dir_.value(), true);
-    file_util::CreateDirectory(script_dir_.value());
+    file_util::Delete(script_dir_, true);
+    file_util::CreateDirectory(script_dir_);
 
     // Register for all user script notifications.
     NotificationService::current()->AddObserver(this,
@@ -44,8 +43,8 @@ class UserScriptMasterTest : public testing::Test,
         NotificationService::AllSources());
 
     // Clean up test directory.
-    ASSERT_TRUE(file_util::Delete(script_dir_.value(), true));
-    ASSERT_FALSE(file_util::PathExists(script_dir_.value()));
+    ASSERT_TRUE(file_util::Delete(script_dir_, true));
+    ASSERT_FALSE(file_util::PathExists(script_dir_));
   }
 
   virtual void Observe(NotificationType type,
@@ -90,10 +89,10 @@ TEST_F(UserScriptMasterTest, NewScripts) {
 
   FilePath path = script_dir_.Append(FILE_PATH_LITERAL("script.user.js"));
 
-  std::ofstream file;
-  file.open(WideToUTF8(path.value()).c_str());
-  file << "some content";
-  file.close();
+  FILE* file = file_util::OpenFile(path, "w");
+  const char content[] = "some content";
+  fwrite(content, 1, arraysize(content), file);
+  file_util::CloseFile(file);
 
   message_loop_.Run();
 
@@ -103,10 +102,11 @@ TEST_F(UserScriptMasterTest, NewScripts) {
 // Test that we get notified about scripts if they're already in the test dir.
 TEST_F(UserScriptMasterTest, ExistingScripts) {
   FilePath path = script_dir_.Append(FILE_PATH_LITERAL("script.user.js"));
-  std::ofstream file;
-  file.open(WideToUTF8(path.value()).c_str());
-  file << "some content";
-  file.close();
+
+  FILE* file = file_util::OpenFile(path, "w");
+  const char content[] = "some content";
+  fwrite(content, 1, arraysize(content), file);
+  file_util::CloseFile(file);
 
   scoped_refptr<UserScriptMaster> master(
       new UserScriptMaster(MessageLoop::current(), script_dir_));
diff --git a/chrome/browser/url_fetcher_unittest.cc b/chrome/browser/url_fetcher_unittest.cc
index 308964b..dccf560 100644
--- a/chrome/browser/url_fetcher_unittest.cc
+++ b/chrome/browser/url_fetcher_unittest.cc
@@ -97,11 +97,11 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
                                   const std::string& data);
 
  protected:
-  std::wstring GetExpiredCertPath();
+  FilePath GetExpiredCertPath();
   SSLTestUtil util_;
 
  private:
-  std::wstring cert_dir_;
+  FilePath cert_dir_;
 };
 
 // Version of URLFetcherTest that tests request cancellation on shutdown.
@@ -261,9 +261,11 @@ void URLFetcherProtectTest::OnURLFetchComplete(const URLFetcher* source,
 
 URLFetcherBadHTTPSTest::URLFetcherBadHTTPSTest() {
   PathService::Get(base::DIR_SOURCE_ROOT, &cert_dir_);
-  cert_dir_ += L"/chrome/test/data/ssl/certificates/";
-  std::replace(cert_dir_.begin(), cert_dir_.end(),
-               L'/', FilePath::kSeparators[0]);
+  cert_dir_ = cert_dir_.Append(FILE_PATH_LITERAL("chrome"));
+  cert_dir_ = cert_dir_.Append(FILE_PATH_LITERAL("test"));
+  cert_dir_ = cert_dir_.Append(FILE_PATH_LITERAL("data"));
+  cert_dir_ = cert_dir_.Append(FILE_PATH_LITERAL("ssl"));
+  cert_dir_ = cert_dir_.Append(FILE_PATH_LITERAL("certificates"));
 }
 
 // The "server certificate expired" error should result in automatic
@@ -289,10 +291,8 @@ void URLFetcherBadHTTPSTest::OnURLFetchComplete(
   io_loop_.Quit();
 }
 
-std::wstring URLFetcherBadHTTPSTest::GetExpiredCertPath() {
-  std::wstring path(cert_dir_);
-  file_util::AppendToPath(&path, L"expired_cert.pem");
-  return path;
+FilePath URLFetcherBadHTTPSTest::GetExpiredCertPath() {
+  return cert_dir_.Append(FILE_PATH_LITERAL("expired_cert.pem"));
 }
 
 void URLFetcherCancelTest::CreateFetcher(const GURL& url) {
@@ -419,10 +419,16 @@ TEST_F(URLFetcherProtectTest, ServerUnavailable) {
   MessageLoop::current()->Run();
 }
 
+#if defined(OS_WIN)
 TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) {
+#else
+// TODO(port): Enable BadHTTPSTest. Currently asserts in
+// URLFetcherBadHTTPSTest::OnURLFetchComplete don't pass.
+TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) {
+#endif
   scoped_refptr<HTTPSTestServer> server =
       HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort,
-                         kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
+          kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
   ASSERT_TRUE(NULL != server.get());
 
   CreateFetcher(GURL(server->TestServerPage("defaultresponse")));
diff --git a/chrome/common/l10n_util.cc b/chrome/common/l10n_util.cc
index 71b2450..f783aad 100644
--- a/chrome/common/l10n_util.cc
+++ b/chrome/common/l10n_util.cc
@@ -318,13 +318,18 @@ std::wstring GetLocalName(const std::wstring& locale_code_wstr,
     return name_local;
 }
 
-#if defined(OS_WIN)
-// TODO(port): re-enable.
 std::wstring GetString(int message_id) {
+#if defined(OS_WIN)
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
   return rb.GetLocalizedString(message_id);
+#else
+  NOTIMPLEMENTED();  // TODO(port): Real implementation of GetString.
+  return L"";
+#endif
 }
 
+#if defined(OS_WIN)
+// TODO(port): re-enable.
 static std::wstring GetStringF(int message_id,
                                const std::wstring& a,
                                const std::wstring& b,
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index 5fefdcd..bf9cc51 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 
+#include "base/process.h"
 #include "base/ref_counted.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/resource_dispatcher.h"
@@ -109,7 +110,8 @@ class ResourceDispatcherTest : public testing::Test,
       char* put_data_here = static_cast<char*>(shared_mem.memory());
       memcpy(put_data_here, test_page_contents, test_page_contents_len);
       base::SharedMemoryHandle dup_handle;
-      EXPECT_TRUE(shared_mem.GiveToProcess(GetCurrentProcess(), &dup_handle));
+      EXPECT_TRUE(shared_mem.GiveToProcess(
+          base::Process::Current().handle(), &dup_handle));
       dispatcher_->OnReceivedData(request_id, dup_handle, test_page_contents_len);
 
       message_queue_.erase(message_queue_.begin());
diff --git a/chrome/renderer/net/render_dns_queue_unittest.cc b/chrome/renderer/net/render_dns_queue_unittest.cc
index 11ddca91..898f38d 100644
--- a/chrome/renderer/net/render_dns_queue_unittest.cc
+++ b/chrome/renderer/net/render_dns_queue_unittest.cc
@@ -19,8 +19,8 @@ class DnsQueueTest : public testing::Test {
 // value in sync with the Push value.
 class DnsQueueSequentialTester {
  public:
-  DnsQueueSequentialTester::DnsQueueSequentialTester(
-    DnsQueue& buffer, int32 read_counter = 0, int32 write_counter = 0);
+  DnsQueueSequentialTester(DnsQueue& buffer, int32 read_counter = 0,
+                           int32 write_counter = 0);
 
   // Return of false means buffer was full, or would not take entry.
   bool Push(void);  // Push the string value of next number.
@@ -129,34 +129,34 @@ TEST(DnsQueueTest, SizeCheck) {
   std::string string;
   DnsQueue buffer(buffer_size);
 
-  EXPECT_EQ(0, buffer.Size());
+  EXPECT_EQ(0U, buffer.Size());
   EXPECT_FALSE(buffer.Pop(&string));
   EXPECT_EQ(DnsQueue::SUCCESSFUL_PUSH, buffer.Push(input_string));
-  EXPECT_EQ(1, buffer.Size());
+  EXPECT_EQ(1U, buffer.Size());
   EXPECT_EQ(DnsQueue::SUCCESSFUL_PUSH, buffer.Push("Hi There"));
-  EXPECT_EQ(2, buffer.Size());
+  EXPECT_EQ(2U, buffer.Size());
   EXPECT_TRUE(buffer.Pop(&string));
-  EXPECT_EQ(1, buffer.Size());
+  EXPECT_EQ(1U, buffer.Size());
   EXPECT_TRUE(buffer.Pop(&string));
-  EXPECT_EQ(0, buffer.Size());
+  EXPECT_EQ(0U, buffer.Size());
   EXPECT_EQ(DnsQueue::SUCCESSFUL_PUSH, buffer.Push(input_string));
-  EXPECT_EQ(1, buffer.Size());
+  EXPECT_EQ(1U, buffer.Size());
 
   // Check to see that the first string, if repeated, is discarded.
   EXPECT_EQ(DnsQueue::REDUNDANT_PUSH, buffer.Push(input_string));
-  EXPECT_EQ(1, buffer.Size());
+  EXPECT_EQ(1U, buffer.Size());
 }
 
 TEST(DnsQueueTest, FillThenEmptyCheck) {
   // Use a big buffer so we'll get a bunch of writes in.
   // This tests to be sure the buffer holds many strings.
   // We also make sure they all come out intact.
-  const int buffer_size = 1000;
-  int byte_usage_counter = 1;  // Separation character between pointer.
+  const size_t buffer_size = 1000;
+  size_t byte_usage_counter = 1;  // Separation character between pointer.
   DnsQueue buffer(buffer_size);
   DnsQueueSequentialTester tester(buffer);
 
-  int write_success;
+  size_t write_success;
   for (write_success = 0; write_success < buffer_size; write_success++) {
     if (!tester.Push())
       break;
@@ -173,7 +173,7 @@ TEST(DnsQueueTest, FillThenEmptyCheck) {
   EXPECT_GE(byte_usage_counter, buffer_size - 4)
       << "Buffer does not appear to have filled";
 
-  EXPECT_GE(write_success, 10) << "Couldn't even write 10 one digit strings "
+  EXPECT_GE(write_success, 10U) << "Couldn't even write 10 one digit strings "
       "in " << buffer_size << " byte buffer";
 
 
@@ -182,19 +182,19 @@ TEST(DnsQueueTest, FillThenEmptyCheck) {
       break;
     write_success--;
   }
-  EXPECT_EQ(write_success, 0) << "Push and Pop count were different";
+  EXPECT_EQ(write_success, 0U) << "Push and Pop count were different";
 
   EXPECT_FALSE(tester.Pop()) << "Read from empty buffer succeeded";
 }
 
 TEST(DnsQueueTest, ClearCheck) {
   // Use a big buffer so we'll get a bunch of writes in.
-  const int buffer_size = 1000;
+  const size_t buffer_size = 1000;
   DnsQueue buffer(buffer_size);
   std::string string("ABC");
   DnsQueueSequentialTester tester(buffer);
 
-  int write_success;
+  size_t write_success;
   for (write_success = 0; write_success < buffer_size; write_success++) {
     if (!tester.Push())
       break;
@@ -202,9 +202,9 @@ TEST(DnsQueueTest, ClearCheck) {
   }
 
   buffer.Clear();
-  EXPECT_EQ(buffer.Size(), 0);
+  EXPECT_EQ(buffer.Size(), 0U);
 
-  int write_success2;
+  size_t write_success2;
   for (write_success2 = 0; write_success2 < buffer_size; write_success2++) {
     if (!tester.Push())
       break;
@@ -216,9 +216,9 @@ TEST(DnsQueueTest, ClearCheck) {
     EXPECT_TRUE(buffer.Pop(&string));
   }
 
-  EXPECT_EQ(buffer.Size(), 0);
+  EXPECT_EQ(buffer.Size(), 0U);
   buffer.Clear();
-  EXPECT_EQ(buffer.Size(), 0);
+  EXPECT_EQ(buffer.Size(), 0U);
 }
 
 TEST(DnsQueueTest, WrapOnVariousSubstrings) {
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index a192cab..011bfc2 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -46,6 +46,7 @@ env.Prepend(
         'common',
         'plugin',
         'renderer',
+        'sdch',
         'sqlite',
         'util',
         'v8_snapshot',
@@ -140,6 +141,8 @@ if not env.Bit('mac'):
       '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
+      '$CHROME_DIR/browser/spellcheck_unittest.cc',
+      '$CHROME_DIR/browser/url_fetcher_unittest.cc',
       '$CHROME_DIR/common/animation_unittest.cc',
       '$CHROME_DIR/common/bzip2_unittest.cc',
       '$CHROME_DIR/common/gfx/chrome_font_unittest.cc',
@@ -148,6 +151,11 @@ if not env.Bit('mac'):
       '$CHROME_DIR/common/json_value_serializer_unittest.cc',
       '$CHROME_DIR/common/mru_cache_unittest.cc',
       '$CHROME_DIR/common/notification_service_unittest.cc',
+      '$CHROME_DIR/common/pref_member_unittest.cc',
+      '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+      '$CHROME_DIR/test/test_notification_tracker.cc',
+
+      '$NET_DIR/base/ssl_test_util$OBJSUFFIX',
   ])
 
 if env.Bit('windows'):
@@ -202,13 +210,11 @@ if env.Bit('windows'):
       '$CHROME_DIR/browser/sessions/session_service_unittest.cc',
       '$CHROME_DIR/browser/sessions/tab_restore_service_unittest.cc',
       '$CHROME_DIR/browser/site_instance_unittest.cc',
-      '$CHROME_DIR/browser/spellcheck_unittest.cc',
       '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
       '$CHROME_DIR/browser/template_url_model_unittest.cc',
       '$CHROME_DIR/browser/template_url_parser_unittest.cc',
       '$CHROME_DIR/browser/template_url_prepopulate_data_unittest.cc',
       '$CHROME_DIR/browser/template_url_unittest.cc',
-      '$CHROME_DIR/browser/url_fetcher_unittest.cc',
       '$CHROME_DIR/browser/url_fixer_upper_unittest.cc',
       '$CHROME_DIR/browser/views/bookmark_editor_view_unittest.cc',
       '$CHROME_DIR/browser/views/keyword_editor_view_unittest.cc',
@@ -222,15 +228,12 @@ if env.Bit('windows'):
       '$CHROME_DIR/common/gfx/text_elider_unittest.cc',
       '$CHROME_DIR/common/ipc_sync_channel_unittest.cc',
       '$CHROME_DIR/common/os_exchange_data_unittest.cc',
-      '$CHROME_DIR/common/pref_member_unittest.cc',
       '$CHROME_DIR/common/pref_service_unittest.cc',
       '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
       '$CHROME_DIR/common/time_format_unittest.cc',
       '$CHROME_DIR/common/win_util_unittest.cc',
       '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
-      '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
       '$CHROME_DIR/renderer/render_widget_unittest.cc',
-      '$CHROME_DIR/test/test_notification_tracker.cc',
       '$CHROME_DIR/test/test_tab_contents.cc',
       '$CHROME_DIR/test/testing_profile.cc',
       '$CHROME_DIR/views/focus_manager_unittest.cc',