Extensions: Minor cleanup, formatting/lint errors.

1. Added missing STL header includes.
2. Whitespace fixup.
3. Proper ordering of forward declarations and header includes.
4. Using FRIEND_TEST_ALL_PREFIXES to eliminate test-only method.
5. Switched to range-based for loops.

Review URL: https://codereview.chromium.org/1786163002

Cr-Commit-Position: refs/heads/master@{#381098}

3 files changed, 16 insertions, 19 deletions

diff --git a/extensions/browser/api/extensions_api_client.cc b/extensions/browser/api/extensions_api_client.cc
index 8426436..7eb174f 100644
--- a/extensions/browser/api/extensions_api_client.cc
+++ b/extensions/browser/api/extensions_api_client.cc
@@ -31,8 +31,7 @@ void ExtensionsAPIClient::AddAdditionalValueStoreCaches(
     const scoped_refptr<SettingsStorageFactory>& factory,
     const scoped_refptr<base::ObserverListThreadSafe<SettingsObserver>>&
         observers,
-    std::map<settings_namespace::Namespace, ValueStoreCache*>* caches) {
-}
+    std::map<settings_namespace::Namespace, ValueStoreCache*>* caches) {}
 
 void ExtensionsAPIClient::AttachWebContentsHelpers(
     content::WebContents* web_contents) const {
diff --git a/extensions/browser/api/extensions_api_client.h b/extensions/browser/api/extensions_api_client.h
index c367906..ca50ba8 100644
--- a/extensions/browser/api/extensions_api_client.h
+++ b/extensions/browser/api/extensions_api_client.h
@@ -38,16 +38,16 @@ class ExtensionOptionsGuestDelegate;
 class ManagementAPIDelegate;
 class MimeHandlerViewGuest;
 class MimeHandlerViewGuestDelegate;
-class WebViewGuest;
-class WebViewGuestDelegate;
-class WebViewPermissionHelper;
-class WebViewPermissionHelperDelegate;
-class WebRequestEventRouterDelegate;
 class RulesCacheDelegate;
 class SettingsObserver;
 class SettingsStorageFactory;
 class ValueStoreCache;
 class VirtualKeyboardDelegate;
+class WebRequestEventRouterDelegate;
+class WebViewGuest;
+class WebViewGuestDelegate;
+class WebViewPermissionHelper;
+class WebViewPermissionHelperDelegate;
 
 // Allows the embedder of the extensions module to customize its support for
 // API features. The embedder must create a single instance in the browser
@@ -97,14 +97,14 @@ class ExtensionsAPIClient {
 
   // Returns a delegate for some of WebViewGuest's behavior. The caller owns the
   // returned WebViewGuestDelegate.
-  virtual WebViewGuestDelegate* CreateWebViewGuestDelegate (
+  virtual WebViewGuestDelegate* CreateWebViewGuestDelegate(
       WebViewGuest* web_view_guest) const;
 
   // Returns a delegate for some of WebViewPermissionHelper's behavior. The
   // caller owns the returned WebViewPermissionHelperDelegate.
   virtual WebViewPermissionHelperDelegate*
-      CreateWebViewPermissionHelperDelegate (
-          WebViewPermissionHelper* web_view_permission_helper) const;
+  CreateWebViewPermissionHelperDelegate(
+      WebViewPermissionHelper* web_view_permission_helper) const;
 
   // Creates a delegate for WebRequestEventRouter.
   virtual WebRequestEventRouterDelegate* CreateWebRequestEventRouterDelegate()
diff --git a/extensions/browser/value_store/leveldb_value_store.cc b/extensions/browser/value_store/leveldb_value_store.cc
index db3e30a..e2529ce 100644
--- a/extensions/browser/value_store/leveldb_value_store.cc
+++ b/extensions/browser/value_store/leveldb_value_store.cc
@@ -177,14 +177,13 @@ ValueStore::ReadResult LeveldbValueStore::Get(
 
   scoped_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
 
-  for (std::vector<std::string>::const_iterator it = keys.begin();
-      it != keys.end(); ++it) {
+  for (const std::string& key : keys) {
     scoped_ptr<base::Value> setting;
-    status.Merge(ReadFromDb(*it, &setting));
+    status.Merge(ReadFromDb(key, &setting));
     if (!status.ok())
       return MakeReadResult(status);
     if (setting)
-      settings->SetWithoutPathExpansion(*it, setting.release());
+      settings->SetWithoutPathExpansion(key, setting.release());
   }
 
   return MakeReadResult(std::move(settings), status);
@@ -291,16 +290,15 @@ ValueStore::WriteResult LeveldbValueStore::Remove(
   leveldb::WriteBatch batch;
   scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
 
-  for (std::vector<std::string>::const_iterator it = keys.begin();
-      it != keys.end(); ++it) {
+  for (const std::string& key : keys) {
     scoped_ptr<base::Value> old_value;
-    status.Merge(ReadFromDb(*it, &old_value));
+    status.Merge(ReadFromDb(key, &old_value));
     if (!status.ok())
       return MakeWriteResult(status);
 
     if (old_value) {
-      changes->push_back(ValueStoreChange(*it, old_value.release(), NULL));
-      batch.Delete(*it);
+      changes->push_back(ValueStoreChange(key, old_value.release(), NULL));
+      batch.Delete(key);
     }
   }