Platform cleanup in common/

Review URL: http://codereview.chromium.org/10988
Patch from Pawel Hajdan Jr.

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

5 files changed, 29 insertions, 20 deletions

diff --git a/chrome/common/mru_cache_unittest.cc b/chrome/common/mru_cache_unittest.cc
index dccc5a8..15f3dc5 100644
--- a/chrome/common/mru_cache_unittest.cc
+++ b/chrome/common/mru_cache_unittest.cc
@@ -46,7 +46,7 @@ TEST(MRUCacheTest, Basic) {
   static const int kItem1Key = 5;
   CachedItem item1(10);
   Cache::iterator inserted_item = cache.Put(kItem1Key, item1);
-  EXPECT_EQ(1, cache.size());
+  EXPECT_EQ(1U, cache.size());
 
   // Check that item1 was properly inserted.
   {
@@ -64,7 +64,7 @@ TEST(MRUCacheTest, Basic) {
   static const int kItem2Key = 7;
   CachedItem item2(12);
   cache.Put(kItem2Key, item2);
-  EXPECT_EQ(2, cache.size());
+  EXPECT_EQ(2U, cache.size());
 
   // Check that item1 is the oldest since item2 was added afterwards.
   {
@@ -94,14 +94,14 @@ TEST(MRUCacheTest, Basic) {
   {
     Cache::reverse_iterator next = cache.Erase(cache.rbegin());
 
-    EXPECT_EQ(1, cache.size());
+    EXPECT_EQ(1U, cache.size());
 
     EXPECT_TRUE(next == cache.rbegin());
     EXPECT_EQ(kItem1Key, next->first);
     EXPECT_EQ(item1.value, next->second.value);
 
     cache.Erase(cache.begin());
-    EXPECT_EQ(0, cache.size());
+    EXPECT_EQ(0U, cache.size());
   }
 }
 
@@ -163,7 +163,7 @@ TEST(MRUCacheTest, KeyReplacement) {
   CachedItem item5(50);
   cache.Put(kItem3Key, item5);
 
-  EXPECT_EQ(4, cache.size());
+  EXPECT_EQ(4U, cache.size());
   for (int i = 0; i < 3; ++i) {
     Cache::reverse_iterator iter = cache.rbegin();
     ASSERT_TRUE(iter != cache.rend());
@@ -191,7 +191,7 @@ TEST(MRUCacheTest, Owning) {
 
   // There should still be one item, and one extra live item.
   Cache::iterator iter = cache.Get(kItem1Key);
-  EXPECT_EQ(1, cache.size());
+  EXPECT_EQ(1U, cache.size());
   EXPECT_TRUE(iter != cache.end());
   EXPECT_EQ(initial_count + 1, cached_item_live_count);
 
diff --git a/chrome/common/pref_member_unittest.cc b/chrome/common/pref_member_unittest.cc
index 672c3b1..d016674 100644
--- a/chrome/common/pref_member_unittest.cc
+++ b/chrome/common/pref_member_unittest.cc
@@ -22,7 +22,7 @@ void RegisterTestPrefs(PrefService* prefs) {
 
 class PrefMemberTestClass : public NotificationObserver {
  public:
-  PrefMemberTestClass(PrefService* prefs) : prefs_(prefs), observe_cnt_(0) {
+  PrefMemberTestClass(PrefService* prefs) : observe_cnt_(0), prefs_(prefs) {
     str_.Init(kStringPref, prefs, this);
   }
 
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 3220c05..435d2bf 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -10,6 +10,8 @@
 #ifndef CHROME_TEST_TESTING_BROWSER_PROCESS_H__
 #define CHROME_TEST_TESTING_BROWSER_PROCESS_H__
 
+#include "build/build_config.h"
+
 #include <string>
 
 #include "base/string_util.h"
@@ -20,7 +22,9 @@
 class TestingBrowserProcess : public BrowserProcess {
  public:
   TestingBrowserProcess() {
+#if defined(OS_WIN)
     shutdown_event_ = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+#endif
   }
   virtual ~TestingBrowserProcess() {
   }
@@ -120,12 +124,16 @@ class TestingBrowserProcess : public BrowserProcess {
 
   virtual SuspendController* suspend_controller() { return NULL; }
 
+#if defined(OS_WIN)
   virtual HANDLE shutdown_event() { return shutdown_event_; }
+#endif
 
  private:
   NotificationService notification_service_;
+#if defined(OS_WIN)
   HANDLE shutdown_event_;
-  DISALLOW_EVIL_CONSTRUCTORS(TestingBrowserProcess);
+#endif
+  DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);
 };
 
 #endif  // CHROME_TEST_TESTING_BROWSER_PROCESS_H__
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 3ea6059..8847988 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -5,17 +5,21 @@
 #ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
 #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
 
+#include "build/build_config.h"
+
 #include "base/stats_table.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/test_suite.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#if defined(OS_WIN) // to be ported
+#if defined(OS_WIN)
+// TODO(port): Remove the #ifdef when ResourceBundle is ported.
 #include "chrome/common/resource_bundle.h"
-#include "chrome/test/testing_browser_process.h"
 #endif
+#include "chrome/test/testing_browser_process.h"
 
 class ChromeTestSuite : public TestSuite {
 public:
@@ -26,13 +30,11 @@ protected:
 
   virtual void Initialize() {
     base::ScopedNSAutoreleasePool autorelease_pool;
-    
+
     TestSuite::Initialize();
 
     chrome::RegisterPathProvider();
-#if defined(OS_WIN) // to be ported
     g_browser_process = new TestingBrowserProcess;
-#endif
 
     // Notice a user data override, and otherwise default to using a custom
     // user data directory that lives alongside the current app.
@@ -46,7 +48,9 @@ protected:
     if (!user_data_dir.empty())
       PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
 
-#if defined(OS_WIN) // to be ported
+#if defined(OS_WIN)
+    // TODO(port): Remove the #ifdef when ResourceBundle is ported.
+    //
     // Force unittests to run using en-us so if we test against string
     // output, it'll pass regardless of the system language.
     ResourceBundle::InitSharedInstance(L"en-us");
@@ -59,12 +63,13 @@ protected:
   }
 
   virtual void Shutdown() {
-#if defined(OS_WIN) // to be ported
+#if defined(OS_WIN)
+    // TODO(port): Remove the #ifdef when ResourceBundle is ported.
     ResourceBundle::CleanupSharedInstance();
+#endif
 
     delete g_browser_process;
     g_browser_process = NULL;
-#endif
 
     // Tear down shared StatsTable; prevents unit_tests from leaking it.
     StatsTable::set_current(NULL);
diff --git a/chrome/test/unit/run_all_unittests.cc b/chrome/test/unit/run_all_unittests.cc
index 84f1dae..8c162f1 100644
--- a/chrome/test/unit/run_all_unittests.cc
+++ b/chrome/test/unit/run_all_unittests.cc
@@ -2,11 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "build/build_config.h"
 #include "base/process_util.h"
-
-#include "base/test_suite.h"
-
 #include "chrome/test/unit/chrome_test_suite.h"
 
 int main(int argc, char **argv) {