More code cleanups found by -Wextra.

(I'm still waiting on a v8 change to turn this on for the whole codebase...)

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

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

8 files changed, 22 insertions, 26 deletions

diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
index fafc2119..91db537 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -66,7 +66,7 @@ class ListenSocketTestAction {
 
   const std::string data() const { return data_; }
   const DevToolsRemoteMessage message() { return message_; }
-  const ActionType type() const { return action_; }
+  ActionType type() const { return action_; }
 
  private:
   ActionType action_;
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index a3fdfdf..235a6f4 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -223,7 +223,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
   void DonePaintingToBackingStore();
 
   // Returns the video layer if it exists, NULL otherwise.
-  VideoLayer* const video_layer() { return video_layer_.get(); }
+  VideoLayer* video_layer() const { return video_layer_.get(); }
 
   // Checks to see if we can give up focus to this widget through a JS call.
   virtual bool CanBlur() const { return true; }
diff --git a/chrome/browser/sync/sessions/ordered_commit_set.h b/chrome/browser/sync/sessions/ordered_commit_set.h
index 144fba1..3252826 100644
--- a/chrome/browser/sync/sessions/ordered_commit_set.h
+++ b/chrome/browser/sync/sessions/ordered_commit_set.h
@@ -57,7 +57,7 @@ class OrderedCommitSet {
   }
 
   // Same as above, but for ModelType of the item.
-  const syncable::ModelType GetModelTypeAt(const size_t position) const {
+  syncable::ModelType GetModelTypeAt(const size_t position) const {
     return types_[position];
   }
 
diff --git a/chrome/browser/sync/sessions/status_controller.h b/chrome/browser/sync/sessions/status_controller.h
index 1169b2e..93287cf 100644
--- a/chrome/browser/sync/sessions/status_controller.h
+++ b/chrome/browser/sync/sessions/status_controller.h
@@ -118,7 +118,7 @@ class StatusController {
     DCHECK(CurrentCommitIdProjectionHasIndex(index));
     return shared_.commit_set.GetCommitIdAt(index);
   }
-  const syncable::ModelType GetCommitIdModelTypeAt(size_t index) {
+  syncable::ModelType GetCommitIdModelTypeAt(size_t index) {
     DCHECK(CurrentCommitIdProjectionHasIndex(index));
     return shared_.commit_set.GetModelTypeAt(index);
   }
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index b1c8d5b..d52ac39 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1746,15 +1746,13 @@ ExtensionAction* LocationBarView::GetPageAction(size_t index) {
 }
 
 ExtensionAction* LocationBarView::GetVisiblePageAction(size_t index) {
-  if (index >= 0) {
-    size_t current = 0;
-    for (size_t i = 0; i < page_action_views_.size(); ++i) {
-      if (page_action_views_[i]->IsVisible()) {
-        if (current == index)
-          return page_action_views_[i]->image_view()->page_action();
-
-        ++current;
-      }
+  size_t current = 0;
+  for (size_t i = 0; i < page_action_views_.size(); ++i) {
+    if (page_action_views_[i]->IsVisible()) {
+      if (current == index)
+        return page_action_views_[i]->image_view()->page_action();
+
+      ++current;
     }
   }
 
@@ -1763,17 +1761,15 @@ ExtensionAction* LocationBarView::GetVisiblePageAction(size_t index) {
 }
 
 void LocationBarView::TestPageActionPressed(size_t index) {
-  if (index >= 0) {
-    size_t current = 0;
-    for (size_t i = 0; i < page_action_views_.size(); ++i) {
-      if (page_action_views_[i]->IsVisible()) {
-        if (current == index) {
-          const int kLeftMouseButton = 1;
-          page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton);
-          return;
-        }
-        ++current;
+  size_t current = 0;
+  for (size_t i = 0; i < page_action_views_.size(); ++i) {
+    if (page_action_views_[i]->IsVisible()) {
+      if (current == index) {
+        const int kLeftMouseButton = 1;
+        page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton);
+        return;
       }
+      ++current;
     }
   }
 
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 96f2b6e..6965d01 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -62,7 +62,7 @@ class AutofillWebDataServiceConsumer: public WebDataServiceConsumer {
     MessageLoop::current()->Quit();
   }
 
-  WebDataService::Handle const handle() { return handle_; }
+  WebDataService::Handle handle() { return handle_; }
   const std::vector<string16>& values() { return values_; }
 
  private:
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index d65abbe..4149900 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -68,7 +68,7 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
   const std::string& data() const {
     return data_;
   }
-  const bool complete() const {
+  bool complete() const {
     return complete_;
   }
 
diff --git a/chrome/renderer/mock_printer.h b/chrome/renderer/mock_printer.h
index c97f149..dc186fc 100644
--- a/chrome/renderer/mock_printer.h
+++ b/chrome/renderer/mock_printer.h
@@ -40,7 +40,7 @@ class MockPrinterPage : public base::RefCounted<MockPrinterPage> {
   int width() const { return image_.size().width(); }
   int height() const { return image_.size().height(); }
   const uint8* source_data() const { return source_data_.get(); }
-  const uint32 source_size() const { return source_size_; }
+  uint32 source_size() const { return source_size_; }
   const printing::Image& image() const { return image_; }
 
  private: