Fixes for re-enabling more MSVC level 4 warnings: chrome/browser/ edition

chrome/browser/extensions/activity_log/uma_policy.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/extensions/activity_log/uma_policy.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 87 matching lines @@
     return;
 
   SiteMap::iterator site_lookup = url_status_.find(url);
   if (site_lookup != url_status_.end())
     site_lookup->second[action->extension_id()] |= status;
 }
 
 int UmaPolicy::MatchActionToStatus(scoped_refptr<Action> action) {
   if (action->action_type() == Action::ACTION_CONTENT_SCRIPT) {
     return kContentScript;
-  } else if (action->action_type() == Action::ACTION_API_CALL &&
-             action->api_name() == "tabs.executeScript") {
+  }
+  if (action->action_type() == Action::ACTION_API_CALL &&
+      action->api_name() == "tabs.executeScript") {
     return kContentScript;
-  } else if (action->action_type() != Action::ACTION_DOM_ACCESS) {
+  }

[Finnur, 2014/07/03 12:17:54]

nit: None of these return line need the braces (lines 107, 111, 120, 143 and
friends) -- consistent with rest of file too.

[Peter Kasting, 2014/07/07 19:15:29]

Sure, I can remove these.

+  if (action->action_type() != Action::ACTION_DOM_ACCESS)
     return kNoStatus;
-  }
 
-  int dom_verb;
+  int dom_verb = DomActionType::MODIFIED;
   if (!action->other() ||
       !action->other()->GetIntegerWithoutPathExpansion(
           activity_log_constants::kActionDomVerb, &dom_verb)) {
     return kNoStatus;
   }
 
   int ret_bit = kNoStatus;
   DomActionType::Type dom_type = static_cast<DomActionType::Type>(dom_verb);
   if (dom_type == DomActionType::GETTER)
     return kReadDom;
-  if (dom_type == DomActionType::SETTER) {
+  if (dom_type == DomActionType::SETTER)
     ret_bit |= kModifiedDom;
-  } else if (dom_type == DomActionType::METHOD) {
+  else if (dom_type == DomActionType::METHOD)
     ret_bit |= kDomMethod;
-  } else {
+  else
     return kNoStatus;
-  }
 
   if (action->api_name() == "HTMLDocument.write" ||
       action->api_name() == "HTMLDocument.writeln") {
     ret_bit |= kDocumentWrite;
   } else if (action->api_name() == "Element.innerHTML") {
     ret_bit |= kInnerHtml;
   } else if (action->api_name() == "Document.createElement") {
     std::string arg;
     action->args()->GetString(0, &arg);
     if (arg == "script") {
@@ skipping 311 matching lines @@
       return "AdLikelyReplaced";
     case NONE:
     case MAX_STATUS:
     default:
       NOTREACHED();
       return "";
   }
 }
 
 }  // namespace extensions