gcc 4.6 warnings cleanup

BUG=87490
TEST=compile with gcc 4.6


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

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

7 files changed, 5 insertions, 20 deletions

diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc
index bbcb3e5..249ae18 100644
--- a/base/tools_sanity_unittest.cc
+++ b/base/tools_sanity_unittest.cc
@@ -99,6 +99,7 @@ TEST(ToolsSanityTest, SingleElementDeletedWithBraces) {
 
   // Without the |volatile|, clang optimizes away the next two lines.
   int* volatile foo = new int;
+  (void) foo;
   delete [] foo;
 }
 
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index a333e04..82cbb99 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -143,8 +143,6 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabled) {
 
 // Test that disabling saving browser history really works.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) {
-  base::TimeTicks start_time = base::TimeTicks::Now();
-
   GetPrefs()->SetBoolean(prefs::kSavingBrowserHistoryDisabled, true);
 
   EXPECT_TRUE(GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS));
@@ -161,8 +159,6 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryDisabled) {
 // Test that changing the pref takes effect immediately
 // when the browser is running.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, SavingHistoryEnabledThenDisabled) {
-  base::TimeTicks start_time = base::TimeTicks::Now();
-
   EXPECT_FALSE(GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled));
 
   ui_test_utils::WaitForHistoryToLoad(browser());
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5178a7a..2c75f98 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -5242,8 +5242,6 @@ void Browser::OnWindowDidShow() {
     return;
   window_has_shown_ = true;
 
-  bool did_show_bubble = false;
-
   // Show the First Run information bubble if we've been told to.
   PrefService* local_state = g_browser_process->local_state();
   if (local_state &&
@@ -5262,14 +5260,12 @@ void Browser::OnWindowDidShow() {
     // Reset the preference so we don't show the bubble for subsequent windows.
     local_state->ClearPref(prefs::kShouldShowFirstRunBubble);
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
-    did_show_bubble = true;
   } else if (is_type_tabbed()) {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
-      did_show_bubble = true;
     }
   }
 }
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 04fd6f3..c12972f 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -238,9 +238,6 @@ TEST_F(FFmpegDemuxerTest, Read_VideoNonZeroStart) {
   // Test the start time is the first timestamp of the video and audio stream.
   InitializeDemuxer(CreateDataSource("nonzero-start-time.webm"));
 
-  const base::TimeDelta kExpectedTimestamp =
-      base::TimeDelta::FromMicroseconds(396000);
-
   // Attempt a read from the video stream and run the message loop until done.
   scoped_refptr<DemuxerStream> video =
       demuxer_->GetStream(DemuxerStream::VIDEO);
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc
index 4b46ee7..2ab4b3f 100644
--- a/media/video/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/video/ffmpeg_video_decode_engine_unittest.cc
@@ -175,10 +175,6 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) {
 TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) {
   Initialize();
 
-  // We rely on FFmpeg for timestamp and duration reporting.
-  const base::TimeDelta kTimestamp = base::TimeDelta::FromMicroseconds(0);
-  const base::TimeDelta kDuration = base::TimeDelta::FromMicroseconds(10000);
-
   // Simulate decoding a single frame.
   scoped_refptr<VideoFrame> video_frame;
   DecodeASingleFrame(i_frame_buffer_, &video_frame);
@@ -187,8 +183,7 @@ TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) {
   // the buffer timestamp.
   ASSERT_TRUE(video_frame);
   EXPECT_EQ(0, video_frame->GetTimestamp().ToInternalValue());
-  EXPECT_EQ(kDuration.ToInternalValue(),
-            video_frame->GetDuration().ToInternalValue());
+  EXPECT_EQ(10000, video_frame->GetDuration().ToInternalValue());
 }
 
 
diff --git a/ui/gfx/surface/accelerated_surface_linux.cc b/ui/gfx/surface/accelerated_surface_linux.cc
index a74ac5c..da2dde4 100644
--- a/ui/gfx/surface/accelerated_surface_linux.cc
+++ b/ui/gfx/surface/accelerated_surface_linux.cc
@@ -23,7 +23,8 @@ AcceleratedSurface::AcceleratedSurface(const gfx::Size& size)
       dpy, window, size_.width(), size_.height(), gwa.depth);
 
   image_ = eglCreateImageKHR(
-      edpy, EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR, (void*) pixmap_, NULL);
+      edpy, EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR,
+      reinterpret_cast<void*>(pixmap_), NULL);
 
   glGenTextures(1, &texture_);
 
diff --git a/webkit/fileapi/file_system_usage_cache.cc b/webkit/fileapi/file_system_usage_cache.cc
index 4ac3a1b..46bbdff 100644
--- a/webkit/fileapi/file_system_usage_cache.cc
+++ b/webkit/fileapi/file_system_usage_cache.cc
@@ -85,8 +85,7 @@ bool FileSystemUsageCache::Invalidate(const FilePath& usage_file_path) {
 bool FileSystemUsageCache::IsValid(const FilePath& usage_file_path) {
   bool is_valid = true;
   uint32 dirty = 0;
-  int64 fs_usage;
-  fs_usage = Read(usage_file_path, &is_valid, &dirty);
+  Read(usage_file_path, &is_valid, &dirty);
   return is_valid;
 }