Code-style cleanup in src/core/extensions

Picking suggested changes for a clang-format run.

Change-Id: I1a803b0c0bbf305b3e0861fa42b47ee404b4b255
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

8 files changed, 73 insertions, 106 deletions

diff --git a/src/core/extensions/extension_system_qt.cpp b/src/core/extensions/extension_system_qt.cpp
index 7278e50c1..fbe98099c 100644
--- a/src/core/extensions/extension_system_qt.cpp
+++ b/src/core/extensions/extension_system_qt.cpp
@@ -102,8 +102,7 @@ namespace extensions {
 
 namespace {
 
-std::string GenerateId(const base::DictionaryValue *manifest,
-                       const base::FilePath &path)
+std::string GenerateId(const base::DictionaryValue *manifest, const base::FilePath &path)
 {
     std::string raw_key;
     std::string id_input;
@@ -130,49 +129,36 @@ std::unique_ptr<base::DictionaryValue> ParseManifest(const std::string &manifest
 } // namespace
 
 // Dummy Content Verifier Delegate. Added to prevent crashes.
-class ContentVerifierDelegateQt
-        : public ContentVerifierDelegate {
- public:
-  ~ContentVerifierDelegateQt() override {}
-
-  // This should return what verification mode is appropriate for the given
-  // extension, if any.
-    bool ShouldBeVerified(const Extension& extension) override
+class ContentVerifierDelegateQt : public ContentVerifierDelegate
+{
+public:
+    ~ContentVerifierDelegateQt() override {}
+
+    // This should return what verification mode is appropriate for the given
+    // extension, if any.
+    bool ShouldBeVerified(const Extension &extension) override { return false; }
+
+    // Should return the public key to use for validating signatures via the two
+    // out parameters.
+    ContentVerifierKey GetPublicKey() override { return ContentVerifierKey(); }
+    // This should return a URL that can be used to fetch the
+    // verified_contents.json containing signatures for the given extension
+    // id/version pair.
+    GURL GetSignatureFetchUrl(const std::string &extension_id, const base::Version &version) override { return GURL(); }
+
+    // This should return the set of file paths for images used within the
+    // browser process. (These may get transcoded during the install process).
+    std::set<base::FilePath> GetBrowserImagePaths(const extensions::Extension *extension) override
     {
-        return false;
+        return std::set<base::FilePath>();
     }
 
-  // Should return the public key to use for validating signatures via the two
-  // out parameters.
-    ContentVerifierKey GetPublicKey() override {
-        return ContentVerifierKey();
-    }
-  // This should return a URL that can be used to fetch the
-  // verified_contents.json containing signatures for the given extension
-  // id/version pair.
-  GURL GetSignatureFetchUrl(const std::string& extension_id,
-                            const base::Version& version) override {
-      return GURL();
-  }
-
-  // This should return the set of file paths for images used within the
-  // browser process. (These may get transcoded during the install process).
-  std::set<base::FilePath> GetBrowserImagePaths(
-          const extensions::Extension* extension) override {
-      return std::set<base::FilePath>();
-  }
-
-  // Called when the content verifier detects that a read of a file inside
-  // an extension did not match its expected hash.
-  void VerifyFailed(const std::string& extension_id,
-                            ContentVerifyJob::FailureReason reason) override {
-
-  }
-
-  // Called when ExtensionSystem is shutting down.
-  void Shutdown() override {
-
-  }
+    // Called when the content verifier detects that a read of a file inside
+    // an extension did not match its expected hash.
+    void VerifyFailed(const std::string &extension_id, ContentVerifyJob::FailureReason reason) override {}
+
+    // Called when ExtensionSystem is shutting down.
+    void Shutdown() override {}
 };
 
 void ExtensionSystemQt::LoadExtension(std::string extension_id, std::unique_ptr<base::DictionaryValue> manifest, const base::FilePath &directory)
diff --git a/src/core/extensions/extension_system_qt.h b/src/core/extensions/extension_system_qt.h
index 4370f5cc3..04bffb74d 100644
--- a/src/core/extensions/extension_system_qt.h
+++ b/src/core/extensions/extension_system_qt.h
@@ -90,8 +90,8 @@ public:
     ManagementPolicy *management_policy() override;
     ServiceWorkerManager *service_worker_manager() override;
     SharedUserScriptMaster *shared_user_script_master() override;
-    StateStore* state_store() override;
-    StateStore* rules_store() override;
+    StateStore *state_store() override;
+    StateStore *rules_store() override;
     scoped_refptr<ValueStoreFactory> store_factory() override;
     InfoMap *info_map() override;
     QuotaService *quota_service() override;
diff --git a/src/core/extensions/extension_web_contents_observer_qt.h b/src/core/extensions/extension_web_contents_observer_qt.h
index 5f32562fc..a528b3856 100644
--- a/src/core/extensions/extension_web_contents_observer_qt.h
+++ b/src/core/extensions/extension_web_contents_observer_qt.h
@@ -50,8 +50,8 @@
 namespace extensions {
 
 class ExtensionWebContentsObserverQt
-    : public ExtensionWebContentsObserver,
-      public content::WebContentsUserData<ExtensionWebContentsObserverQt>
+    : public ExtensionWebContentsObserver
+    , public content::WebContentsUserData<ExtensionWebContentsObserverQt>
 {
 public:
     explicit ExtensionWebContentsObserverQt(content::WebContents *web_contents);
diff --git a/src/core/extensions/extensions_browser_api_provider_qt.cpp b/src/core/extensions/extensions_browser_api_provider_qt.cpp
index cc1932c64..731dfb0fd 100644
--- a/src/core/extensions/extensions_browser_api_provider_qt.cpp
+++ b/src/core/extensions/extensions_browser_api_provider_qt.cpp
@@ -42,16 +42,13 @@
 #include "extensions/browser/api/generated_api_registration.h"
 
 namespace extensions {
-ExtensionsBrowserAPIProviderQt::ExtensionsBrowserAPIProviderQt() =
-    default;
-ExtensionsBrowserAPIProviderQt::~ExtensionsBrowserAPIProviderQt() =
-    default;
+ExtensionsBrowserAPIProviderQt::ExtensionsBrowserAPIProviderQt() = default;
+ExtensionsBrowserAPIProviderQt::~ExtensionsBrowserAPIProviderQt() = default;
 
-void ExtensionsBrowserAPIProviderQt::RegisterExtensionFunctions(
-    ExtensionFunctionRegistry* registry) {
+void ExtensionsBrowserAPIProviderQt::RegisterExtensionFunctions(ExtensionFunctionRegistry *registry)
+{
     api::GeneratedFunctionRegistry::RegisterAll(registry);
 }
 
 
 }
-
diff --git a/src/core/extensions/extensions_browser_api_provider_qt.h b/src/core/extensions/extensions_browser_api_provider_qt.h
index 612df3825..f1d10ac95 100644
--- a/src/core/extensions/extensions_browser_api_provider_qt.h
+++ b/src/core/extensions/extensions_browser_api_provider_qt.h
@@ -45,7 +45,8 @@
 
 namespace extensions {
 
-class ExtensionsBrowserAPIProviderQt : public ExtensionsBrowserAPIProvider {
+class ExtensionsBrowserAPIProviderQt : public ExtensionsBrowserAPIProvider
+{
 public:
     ExtensionsBrowserAPIProviderQt();
     ~ExtensionsBrowserAPIProviderQt() override;
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index eb8c12bff..59c15d2f5 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -97,72 +97,57 @@ void DetermineCharset(const std::string &mime_type,
     if (base::StartsWith(mime_type, "text/", base::CompareCase::INSENSITIVE_ASCII)) {
         // All of our HTML files should be UTF-8 and for other resource types
         // (like images), charset doesn't matter.
-        DCHECK(base::IsStringUTF8(base::StringPiece(reinterpret_cast<const char*>(data->front()), data->size())));
+        DCHECK(base::IsStringUTF8(base::StringPiece(reinterpret_cast<const char *>(data->front()), data->size())));
         *out_charset = "utf-8";
     }
 }
 
 // A request for an extension resource in a Chrome .pak file. These are used
 // by component extensions.
-class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
+class URLRequestResourceBundleJob : public net::URLRequestSimpleJob
+{
 public:
-    URLRequestResourceBundleJob(net::URLRequest *request,
-                                net::NetworkDelegate *network_delegate,
-                                const base::FilePath &filename,
-                                int resource_id,
-                                const std::string &content_security_policy,
-                                bool send_cors_header)
-            : net::URLRequestSimpleJob(request, network_delegate)
-            , filename_(filename)
-            , resource_id_(resource_id)
-            , weak_factory_(this)
+    URLRequestResourceBundleJob(net::URLRequest *request, net::NetworkDelegate *network_delegate,
+                                const base::FilePath &filename, int resource_id,
+                                const std::string &content_security_policy, bool send_cors_header)
+        : net::URLRequestSimpleJob(request, network_delegate)
+        , filename_(filename)
+        , resource_id_(resource_id)
+        , weak_factory_(this)
     {
         // Leave cache headers out of resource bundle requests.
         response_info_.headers = extensions::BuildHttpHeaders(content_security_policy, send_cors_header, base::Time());
     }
-    int GetRefCountedData(std::string* mime_type,
-                          std::string* charset,
-                          scoped_refptr<base::RefCountedMemory>* data,
+    int GetRefCountedData(std::string *mime_type, std::string *charset, scoped_refptr<base::RefCountedMemory> *data,
                           net::CompletionOnceCallback callback) const override
     {
-        const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+        const ui::ResourceBundle &rb = ui::ResourceBundle::GetSharedInstance();
         *data = rb.LoadDataResourceBytes(resource_id_);
 
         // Add the Content-Length header now that we know the resource length.
-        response_info_.headers->AddHeader(
-                    base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
-                                       base::NumberToString((*data)->size()).c_str()));
+        response_info_.headers->AddHeader(base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
+                                                             base::NumberToString((*data)->size()).c_str()));
 
-        std::string* read_mime_type = new std::string;
+        std::string *read_mime_type = new std::string;
         base::PostTaskWithTraitsAndReplyWithResult(
-            FROM_HERE, {base::MayBlock()},
-            base::BindOnce(&net::GetMimeTypeFromFile, filename_,
-                           base::Unretained(read_mime_type)),
-            base::BindOnce(&URLRequestResourceBundleJob::OnMimeTypeRead,
-                           weak_factory_.GetWeakPtr(), mime_type, charset, *data,
-                           base::Owned(read_mime_type), std::move(callback)));
+                FROM_HERE, { base::MayBlock() },
+                base::BindOnce(&net::GetMimeTypeFromFile, filename_, base::Unretained(read_mime_type)),
+                base::BindOnce(&URLRequestResourceBundleJob::OnMimeTypeRead, weak_factory_.GetWeakPtr(), mime_type,
+                               charset, *data, base::Owned(read_mime_type), std::move(callback)));
 
         return net::ERR_IO_PENDING;
     }
 
-    void GetResponseInfo(net::HttpResponseInfo* info) override
-    {
-        *info = response_info_;
-    }
+    void GetResponseInfo(net::HttpResponseInfo *info) override { *info = response_info_; }
 
 private:
     ~URLRequestResourceBundleJob() override {}
 
-    void OnMimeTypeRead(std::string *out_mime_type,
-                        std::string *charset,
-                        scoped_refptr<base::RefCountedMemory> data,
-                        std::string *read_mime_type,
-                        net::CompletionOnceCallback callback,
-                        bool read_result)
+    void OnMimeTypeRead(std::string *out_mime_type, std::string *charset, scoped_refptr<base::RefCountedMemory> data,
+                        std::string *read_mime_type, net::CompletionOnceCallback callback, bool read_result)
     {
         response_info_.headers->AddHeader(
-                    base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType,
-                                       read_mime_type->c_str()));
+                base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType, read_mime_type->c_str()));
         *out_mime_type = *read_mime_type;
         DetermineCharset(*read_mime_type, data.get(), charset);
         int result = read_result ? net::OK : net::ERR_INVALID_URL;
@@ -444,8 +429,7 @@ bool ExtensionsBrowserClientQt::IsBackgroundUpdateAllowed()
     return true;
 }
 
-bool ExtensionsBrowserClientQt::IsMinBrowserVersionSupported(
-        const std::string &min_version)
+bool ExtensionsBrowserClientQt::IsMinBrowserVersionSupported(const std::string &min_version)
 {
     return true;
 }
@@ -482,7 +466,7 @@ KioskDelegate *ExtensionsBrowserClientQt::GetKioskDelegate()
     return nullptr;
 }
 
-bool ExtensionsBrowserClientQt::IsScreensaverInDemoMode(const std::string& app_id)
+bool ExtensionsBrowserClientQt::IsScreensaverInDemoMode(const std::string &app_id)
 {
     return false;
 }
diff --git a/src/core/extensions/extensions_browser_client_qt.h b/src/core/extensions/extensions_browser_client_qt.h
index 056e65c9e..41cb2ce20 100644
--- a/src/core/extensions/extensions_browser_client_qt.h
+++ b/src/core/extensions/extensions_browser_client_qt.h
@@ -90,8 +90,7 @@ public:
     void GetEarlyExtensionPrefsObservers(content::BrowserContext *context,
                                          std::vector<EarlyExtensionPrefsObserver *> *observers) const override;
     ProcessManagerDelegate *GetProcessManagerDelegate() const override;
-    std::unique_ptr<ExtensionHostDelegate>
-    CreateExtensionHostDelegate() override;
+    std::unique_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() override;
     bool DidVersionUpdate(content::BrowserContext *context) override;
     void PermitExternalProtocolHandler() override;
     bool IsRunningInForcedAppMode() override;
@@ -110,8 +109,7 @@ public:
     ExtensionCache *GetExtensionCache() override;
     bool IsBackgroundUpdateAllowed() override;
     bool IsMinBrowserVersionSupported(const std::string &min_version) override;
-    ExtensionWebContentsObserver *GetExtensionWebContentsObserver(
-            content::WebContents *web_contents) override;
+    ExtensionWebContentsObserver *GetExtensionWebContentsObserver(content::WebContents *web_contents) override;
     KioskDelegate *GetKioskDelegate() override;
 
     // Whether the browser context is associated with Chrome OS lock screen.
@@ -138,7 +136,7 @@ public:
     // Returns the locale used by the application.
     std::string GetApplicationLocale() override;
 
-    bool IsScreensaverInDemoMode(const std::string& app_id) override;
+    bool IsScreensaverInDemoMode(const std::string &app_id) override;
 
     // Sets the API client.
     void SetAPIClientForTest(ExtensionsAPIClient *api_client);
diff --git a/src/core/extensions/pdf_web_contents_helper_client_qt.h b/src/core/extensions/pdf_web_contents_helper_client_qt.h
index a22feb138..9a37375b3 100644
--- a/src/core/extensions/pdf_web_contents_helper_client_qt.h
+++ b/src/core/extensions/pdf_web_contents_helper_client_qt.h
@@ -10,20 +10,21 @@
 
 namespace extensions {
 
-class PDFWebContentsHelperClientQt : public pdf::PDFWebContentsHelperClient {
+class PDFWebContentsHelperClientQt : public pdf::PDFWebContentsHelperClient
+{
 public:
     PDFWebContentsHelperClientQt();
     ~PDFWebContentsHelperClientQt() override;
 
 private:
     // pdf::PDFWebContentsHelperClient:
-    void UpdateContentRestrictions(content::WebContents* contents, int content_restrictions) override;
-    void OnPDFHasUnsupportedFeature(content::WebContents* contents) override;
-    void OnSaveURL(content::WebContents* contents) override;
+    void UpdateContentRestrictions(content::WebContents *contents, int content_restrictions) override;
+    void OnPDFHasUnsupportedFeature(content::WebContents *contents) override;
+    void OnSaveURL(content::WebContents *contents) override;
 
     DISALLOW_COPY_AND_ASSIGN(PDFWebContentsHelperClientQt);
 };
 
-}  // namespace extensions
+} // namespace extensions
 
-#endif  // PDF_WEB_CONTENTS_HELPER_CLIENT_QT_H_
+#endif // PDF_WEB_CONTENTS_HELPER_CLIENT_QT_H_