Build a bunch more of chrome/ on Linux.

Patch from Pawel Hajdan Jr.

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

4 files changed, 13 insertions, 9 deletions

diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index d5f7f5d3..3c0931c 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -51,12 +51,14 @@ input_files = []
 if env['PLATFORM'] in ('posix', 'win32'):
   # TODO(port): Port to Mac.
   input_files.extend([
+      'animation.cc',
       'chrome_constants.cc',
       'chrome_counters.cc',
       'chrome_switches.cc',
       'debug_flags.cc',
       'env_vars.cc',
       'gfx/color_utils.cc',
+      'ipc_message.cc',
       'jpeg_codec.cc',
       'json_value_serializer.cc',
       'libxml_utils.cc',
@@ -66,6 +68,7 @@ if env['PLATFORM'] in ('posix', 'win32'):
       'pref_names.cc',
       'slide_animation.cc',
       'sqlite_compiled_statement.cc',
+      'sqlite_utils.cc',
       'task_queue.cc',
       'throb_animation.cc',
       'thumbnail_score.cc',
@@ -75,7 +78,6 @@ if env['PLATFORM'] in ('posix', 'win32'):
 if env['PLATFORM'] == 'win32':
   # TODO(port): Port these.
   input_files.extend([
-      'animation.cc',
       'child_process.cc',
       'chrome_paths.cc',
       'chrome_plugin_lib.cc',
@@ -95,7 +97,6 @@ if env['PLATFORM'] == 'win32':
       'ipc_channel.cc',
       'ipc_channel_proxy.cc',
       'ipc_logging.cc',
-      'ipc_message.cc',
       'ipc_message_utils.cc',
       'ipc_sync_channel.cc',
       'ipc_sync_message.cc',
@@ -113,7 +114,6 @@ if env['PLATFORM'] == 'win32':
       'resource_bundle.cc',
       'resource_dispatcher.cc',
       'security_filter_peer.cc',
-      'sqlite_utils.cc',
       'time_format.cc',
       'win_safe_util.cc',
       'win_util.cc',
diff --git a/chrome/common/animation_unittest.cc b/chrome/common/animation_unittest.cc
index 3f9da3c..f73e3cd 100644
--- a/chrome/common/animation_unittest.cc
+++ b/chrome/common/animation_unittest.cc
@@ -79,8 +79,8 @@ class TestAnimationDelegate : public AnimationDelegate {
   }
 
  private:
-  bool finished_;
   bool canceled_;
+  bool finished_;
 };
 
 TEST_F(AnimationTest, RunCase) {
diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc
index 16e6e61..3997205 100644
--- a/chrome/common/json_value_serializer_unittest.cc
+++ b/chrome/common/json_value_serializer_unittest.cc
@@ -2,6 +2,7 @@
 // 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"
@@ -186,7 +187,7 @@ void ValidateJsonList(const std::string& json) {
   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;
@@ -210,7 +211,7 @@ TEST(JSONValueSerializerTest, JSONReaderComments) {
   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;
@@ -236,7 +237,7 @@ namespace {
 
       // 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
@@ -249,6 +250,8 @@ namespace {
   };
 }  // 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(
@@ -339,4 +342,4 @@ TEST_F(JSONFileValueSerializerTest, NoWhitespace) {
   ASSERT_TRUE(root);
   delete root;
 }
-
+#endif  // defined(OS_WIN)
diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
index 8718cee..7b38d2f 100644
--- a/chrome/common/sqlite_utils.h
+++ b/chrome/common/sqlite_utils.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_COMMON_SQLITEUTILS_H_
 #define CHROME_COMMON_SQLITEUTILS_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -64,8 +65,8 @@ class SQLTransaction {
   virtual int BeginCommand(const char* command);
   virtual int EndCommand(const char* command);
 
-  bool began_;
   sqlite3* db_;
+  bool began_;
   DISALLOW_COPY_AND_ASSIGN(SQLTransaction);
 };