Removing return value statement from the function that have void return type.

As the function return type is void so return value not required.
and GetSettingsForOneType() also does not return any value.
Another change is conversion from char* to char array.

BUG=520800

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

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

2 files changed, 3 insertions, 4 deletions

diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 7c82a4e..d589afc 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -75,8 +75,7 @@ bool CookieSettings::IsCookieSessionOnly(const GURL& origin) const {
 
 void CookieSettings::GetCookieSettings(
     ContentSettingsForOneType* settings) const {
-  // TODO(dgrogan): Why is this returning a value in a void function?
-  return host_content_settings_map_->GetSettingsForOneType(
+  host_content_settings_map_->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_COOKIES, std::string(), settings);
 }
 
diff --git a/components/content_settings/core/browser/website_settings_info.cc b/components/content_settings/core/browser/website_settings_info.cc
index 0a9cfce..7dd2f2d 100644
--- a/components/content_settings/core/browser/website_settings_info.cc
+++ b/components/content_settings/core/browser/website_settings_info.cc
@@ -10,8 +10,8 @@
 
 namespace {
 
-const char* kPrefPrefix = "profile.content_settings.exceptions.";
-const char* kDefaultPrefPrefix = "profile.default_content_setting_values.";
+const char kPrefPrefix[] = "profile.content_settings.exceptions.";
+const char kDefaultPrefPrefix[] = "profile.default_content_setting_values.";
 
 std::string GetPrefName(const std::string& name, const char* prefix) {
   std::string pref_name = name;