[Extensions] Convert APIs to use movable types [8]

chrome/browser/extensions/api/omnibox/omnibox_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 302 matching lines @@
 
 // This function converts style information populated by the JSON schema
 // compiler into an ACMatchClassifications object.
 ACMatchClassifications StyleTypesToACMatchClassifications(
     const omnibox::SuggestResult &suggestion) {
   ACMatchClassifications match_classifications;
   if (suggestion.description_styles) {
     base::string16 description = base::UTF8ToUTF16(suggestion.description);
     std::vector<int> styles(description.length(), 0);
 
-    for (std::vector<linked_ptr<omnibox::SuggestResult::DescriptionStylesType> >
-         ::iterator i = suggestion.description_styles->begin();
-         i != suggestion.description_styles->end(); ++i) {
-      omnibox::SuggestResult::DescriptionStylesType* style = i->get();
+    for (const omnibox::SuggestResult::DescriptionStylesType& style :
+         *suggestion.description_styles) {
+      int length = description.length();
+      if (style.length)
+        length = *style.length;

[stevenjb, 2016/03/29 00:52:37]

nit: int length = style.length ? :

[Devlin, 2016/03/29 20:20:35]

Done.

 
-      int length = description.length();
-      if (style->length)
-        length = *style->length;
-
-      size_t offset = style->offset >= 0 ? style->offset :
-          std::max(0, static_cast<int>(description.length()) + style->offset);
+      size_t offset = style.offset >= 0
+                          ? style.offset
+                          : std::max(0, static_cast<int>(description.length()) +

[stevenjb, 2016/03/29 00:52:37]

optional nit: clean this up too (casting seems backwards here).

[Devlin, 2016/03/29 20:20:35]

Wrong how?

[stevenjb, 2016/03/29 20:31:45]

Oh, I guess we have to cast to an int to do the signed arithmetic. But then we
assign it to a size_t. It's just kind of confusing and awkward looking, but it's
fine.

+                                            style.offset);
 
       int type_class;
-      switch (style->type) {
+      switch (style.type) {
         case omnibox::DESCRIPTION_STYLE_TYPE_URL:
           type_class = AutocompleteMatch::ACMatchClassification::URL;
           break;
         case omnibox::DESCRIPTION_STYLE_TYPE_MATCH:
           type_class = AutocompleteMatch::ACMatchClassification::MATCH;
           break;
         case omnibox::DESCRIPTION_STYLE_TYPE_DIM:
           type_class = AutocompleteMatch::ACMatchClassification::DIM;
           break;
         default:
@@ skipping 48 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions