Linux: Fix the build for Ubuntu Precise.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9817020

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

4 files changed, 20 insertions, 17 deletions

diff --git a/chrome/browser/ui/panels/panel_overflow_browsertest.cc b/chrome/browser/ui/panels/panel_overflow_browsertest.cc
index b352394..b207d37 100644
--- a/chrome/browser/ui/panels/panel_overflow_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_overflow_browsertest.cc
@@ -115,7 +115,7 @@ class PanelOverflowBrowserTest : public BasePanelBrowserTest {
     panel_manager->SetMouseWatcherForTesting(mouse_watcher);
 
     // All the overflow tests assume 800x600 work area. Do the check now.
-    DCHECK(PanelManager::GetInstance()->work_area().width() == 800);
+    DCHECK_EQ(800, PanelManager::GetInstance()->work_area().width());
   }
 
  protected:
@@ -388,7 +388,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, AddMinimizedTillOverflow) {
 
     docked_strip->AddPanel(panel, PanelStrip::DEFAULT_POSITION);
     EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
-    EXPECT_EQ(false, panel->has_temporary_layout());
+    EXPECT_FALSE(panel->has_temporary_layout());
   }
 
   EXPECT_EQ(num_panels_to_add, num_panels);
@@ -1040,8 +1040,8 @@ IN_PROC_BROWSER_TEST_F(
   //   docked:   P0, P1, P2
   //   overflow: P3, P4, P5
   const int panel_widths[] = {
-      240, 240, 120, // docked
-      240, 240, 240  // overflow
+      240, 240, 120,  // docked
+      240, 240, 240   // overflow
   };
   std::vector<Panel*> panels = CreateOverflowPanels(3, 3, panel_widths);
 
@@ -1300,9 +1300,11 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
 
 // http://crbug.com/115568
 #if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow HoverOverOverflowAreaWithOverflowOfOverflow
+#define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow \
+    HoverOverOverflowAreaWithOverflowOfOverflow
 #else
-#define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow DISABLED_HoverOverOverflowAreaWithOverflowOfOverflow
+#define MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow \
+    DISABLED_HoverOverOverflowAreaWithOverflowOfOverflow
 #endif
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow) {
diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc
index eabc0df..27602162 100644
--- a/chrome/browser/webdata/web_database_migration_unittest.cc
+++ b/chrome/browser/webdata/web_database_migration_unittest.cc
@@ -608,18 +608,18 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion27ToCurrent) {
         "{google:originalQueryForSuggestion}sourceid=chrome&ie={inputEncoding}"\
         "&q={searchTerms}",
         s2.ColumnString(4));
-    EXPECT_EQ(true, s2.ColumnBool(5));
+    EXPECT_TRUE(s2.ColumnBool(5));
     EXPECT_EQ(std::string(), s2.ColumnString(6));
     EXPECT_EQ(0, s2.ColumnInt(7));
     EXPECT_EQ(0, s2.ColumnInt(8));
     EXPECT_EQ(std::string("UTF-8"), s2.ColumnString(9));
-    EXPECT_EQ(true, s2.ColumnBool(10));
+    EXPECT_TRUE(s2.ColumnBool(10));
     EXPECT_EQ(std::string("{google:baseSuggestURL}search?client=chrome&hl="
                           "{language}&q={searchTerms}"), s2.ColumnString(11));
     EXPECT_EQ(1, s2.ColumnInt(12));
-    EXPECT_EQ(true, s2.ColumnBool(13));
+    EXPECT_TRUE(s2.ColumnBool(13));
     EXPECT_EQ(6245, s2.ColumnInt(14));
-    EXPECT_EQ(false, s2.ColumnBool(15));
+    EXPECT_FALSE(s2.ColumnBool(15));
     EXPECT_EQ(std::string(), s2.ColumnString(16));
   }
 }
@@ -1833,18 +1833,18 @@ TEST_F(WebDatabaseMigrationTest, MigrateVersion42ToCurrent) {
               "{google:originalQueryForSuggestion}sourceid=chrome&"
               "ie={inputEncoding}&q={searchTerms}",
               s.ColumnString(4));
-    EXPECT_EQ(true, s.ColumnBool(5));
+    EXPECT_TRUE(s.ColumnBool(5));
     EXPECT_EQ(std::string(), s.ColumnString(6));
     EXPECT_EQ(0, s.ColumnInt(7));
     EXPECT_EQ(0, s.ColumnInt(8));
     EXPECT_EQ("UTF-8", s.ColumnString(9));
-    EXPECT_EQ(true, s.ColumnBool(10));
+    EXPECT_TRUE(s.ColumnBool(10));
     EXPECT_EQ("{google:baseSuggestURL}search?client=chrome&hl={language}&"
               "q={searchTerms}", s.ColumnString(11));
     EXPECT_EQ(1, s.ColumnInt(12));
-    EXPECT_EQ(true, s.ColumnBool(13));
+    EXPECT_TRUE(s.ColumnBool(13));
     EXPECT_EQ(6262, s.ColumnInt(14));
-    EXPECT_EQ(false, s.ColumnBool(15));
+    EXPECT_FALSE(s.ColumnBool(15));
     EXPECT_EQ("{google:baseURL}webhp?{google:RLZ}sourceid=chrome-instant&"
               "ie={inputEncoding}&ion=1{searchTerms}&nord=1",
               s.ColumnString(16));
diff --git a/remoting/host/local_input_monitor_thread_linux.cc b/remoting/host/local_input_monitor_thread_linux.cc
index cae44f1..1adb054 100644
--- a/remoting/host/local_input_monitor_thread_linux.cc
+++ b/remoting/host/local_input_monitor_thread_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -15,6 +15,7 @@
 
 // These includes need to be later than dictated by the style guide due to
 // Xlib header pollution, specifically the min, max, and Status macros.
+#include <X11/XKBlib.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/record.h>
 
@@ -167,7 +168,7 @@ void LocalInputMonitorThread::LocalMouseMoved(const SkIPoint& pos) {
 }
 
 void LocalInputMonitorThread::LocalKeyPressed(int key_code, bool down) {
-  int key_sym = XKeycodeToKeysym(display_, key_code, 0);
+  KeySym key_sym = XkbKeycodeToKeysym(display_, key_code, 0, 0);
   if (key_sym == XK_Control_L || key_sym == XK_Control_R) {
     ctrl_pressed_ = down;
   } else if (key_sym == XK_Alt_L || key_sym == XK_Alt_R) {
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc
index e9b4a12..3ce018a 100644
--- a/webkit/glue/webcursor_gtk.cc
+++ b/webkit/glue/webcursor_gtk.cc
@@ -182,7 +182,7 @@ GdkCursor* WebCursor::GetCustomCursor() {
                                                  hotspot_.x(),
                                                  hotspot_.y());
 
-  gdk_pixbuf_unref(pixbuf);
+  g_object_unref(pixbuf);
 
   if (unref_)
     gdk_cursor_unref(unref_);