Rename constants with the same name

When building with Jumbo, unnamed namespaces gets merged.
Constants with the same name within those namespaces conflict.
This commit renames those constant to something more file
specific.

Bug: 850484
Change-Id: If04a32cbf9ce544d852b1297f229d24d96845c59
Reviewed-on: https://chromium-review.googlesource.com/1096757
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566596}

chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc

@@ -25,9 +25,9 @@ namespace ShowPermissionPromptForDelegatedInstall =
 namespace {
 
 // Error messages that can be returned by the API.
-const char kInvalidIconUrlError[] = "Invalid icon url";
-const char kInvalidIdError[] = "Invalid id";
-const char kInvalidManifestError[] = "Invalid manifest";
+const char kDashboardInvalidIconUrlError[] = "Invalid icon url";
+const char kDashboardInvalidIdError[] = "Invalid id";
+const char kDashboardInvalidManifestError[] = "Invalid manifest";
 const char kUserCancelledError[] = "User cancelled install";
 
 api::dashboard_private::Result WebstoreInstallHelperResultToApiResult(
@@ -61,16 +61,16 @@ DashboardPrivateShowPermissionPromptForDelegatedInstallFunction::Run() {
 
   if (!crx_file::id_util::IdIsValid(params_->details.id)) {
     return RespondNow(BuildResponse(api::dashboard_private::RESULT_INVALID_ID,
-                                    kInvalidIdError));
+                                    kDashboardInvalidIdError));
   }
 
   GURL icon_url;
   if (params_->details.icon_url) {
     icon_url = source_url().Resolve(*params_->details.icon_url);
     if (!icon_url.is_valid()) {
-      return RespondNow(BuildResponse(
-          api::dashboard_private::RESULT_INVALID_ICON_URL,
-          kInvalidIconUrlError));
+      return RespondNow(
+          BuildResponse(api::dashboard_private::RESULT_INVALID_ICON_URL,
+                        kDashboardInvalidIconUrlError));
     }
   }
 
@@ -120,7 +120,7 @@ void DashboardPrivateShowPermissionPromptForDelegatedInstallFunction::
   if (!dummy_extension_.get()) {
     OnWebstoreParseFailure(params_->details.id,
                            WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
-                           kInvalidManifestError);
+                           kDashboardInvalidManifestError);
     return;
   }
 

chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc

@@ -26,7 +26,7 @@ namespace extensions {
 
 namespace {
 
-const char kInvalidTypeOfParameter[] = "Attribute '%s' has an invalid type";
+const char kCssInvalidTypeOfParameter[] = "Attribute '%s' has an invalid type";
 
 }  // namespace
 
@@ -48,14 +48,14 @@ DeclarativeContentCssPredicate::Create(ContentPredicateEvaluator* evaluator,
     for (size_t i = 0; i < css_rules_value->GetSize(); ++i) {
       std::string css_rule;
       if (!css_rules_value->GetString(i, &css_rule)) {
-        *error = base::StringPrintf(kInvalidTypeOfParameter,
+        *error = base::StringPrintf(kCssInvalidTypeOfParameter,
                                     declarative_content_constants::kCss);
         return std::unique_ptr<DeclarativeContentCssPredicate>();
       }
       css_rules.push_back(css_rule);
     }
   } else {
-    *error = base::StringPrintf(kInvalidTypeOfParameter,
+    *error = base::StringPrintf(kCssInvalidTypeOfParameter,
                                 declarative_content_constants::kCss);
     return std::unique_ptr<DeclarativeContentCssPredicate>();
   }

chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc

@@ -19,7 +19,8 @@ namespace extensions {
 
 namespace {
 
-const char kInvalidTypeOfParameter[] = "Attribute '%s' has an invalid type";
+const char kIsBookmarkedInvalidTypeOfParameter[] =
+    "Attribute '%s' has an invalid type";
 const char kIsBookmarkedRequiresBookmarkPermission[] =
     "Property 'isBookmarked' requires 'bookmarks' permission";
 
@@ -59,7 +60,7 @@ DeclarativeContentIsBookmarkedPredicate::Create(
           evaluator, extension, is_bookmarked));
     }
   } else {
-    *error = base::StringPrintf(kInvalidTypeOfParameter,
+    *error = base::StringPrintf(kIsBookmarkedInvalidTypeOfParameter,
                                 declarative_content_constants::kIsBookmarked);
     return std::unique_ptr<DeclarativeContentIsBookmarkedPredicate>();
   }

chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc

@@ -17,7 +17,8 @@ namespace extensions {
 
 namespace {
 
-const char kInvalidTypeOfParameter[] = "Attribute '%s' has an invalid type";
+const char kPageUrlInvalidTypeOfParameter[] =
+    "Attribute '%s' has an invalid type";
 
 static url_matcher::URLMatcherConditionSet::ID g_next_id = 0;
 
@@ -40,7 +41,7 @@ DeclarativeContentPageUrlPredicate::Create(
   scoped_refptr<url_matcher::URLMatcherConditionSet> url_matcher_condition_set;
   const base::DictionaryValue* dict = nullptr;
   if (!value.GetAsDictionary(&dict)) {
-    *error = base::StringPrintf(kInvalidTypeOfParameter,
+    *error = base::StringPrintf(kPageUrlInvalidTypeOfParameter,
                                 declarative_content_constants::kPageUrl);
     return std::unique_ptr<DeclarativeContentPageUrlPredicate>();
   } else {

chrome/browser/extensions/api/downloads/downloads_api.cc

@@ -161,7 +161,7 @@ const char kFileSizeKey[] = "fileSize";
 const char kFilenameKey[] = "filename";
 const char kFilenameRegexKey[] = "filenameRegex";
 const char kIdKey[] = "id";
-const char kIncognitoKey[] = "incognito";
+const char kDownloadsApiIncognitoKey[] = "incognito";
 const char kMimeKey[] = "mime";
 const char kPausedKey[] = "paused";
 const char kQueryKey[] = "query";
@@ -266,7 +266,8 @@ std::unique_ptr<base::DictionaryValue> DownloadItemToJSON(
                   base::TimeToISO8601(download_item->GetStartTime()));
   json->SetDouble(kBytesReceivedKey, download_item->GetReceivedBytes());
   json->SetDouble(kTotalBytesKey, download_item->GetTotalBytes());
-  json->SetBoolean(kIncognitoKey, browser_context->IsOffTheRecord());
+  json->SetBoolean(kDownloadsApiIncognitoKey,
+                   browser_context->IsOffTheRecord());
   if (download_item->GetState() == DownloadItem::INTERRUPTED) {
     json->SetString(kErrorKey, download::DownloadInterruptReasonToString(
                                    download_item->GetLastReason()));

chrome/browser/extensions/api/gcm/gcm_api.cc

@@ -27,7 +27,7 @@
 
 namespace {
 
-const size_t kMaximumMessageSize = 4096;  // in bytes.
+const size_t kMaximumGcmMessageSize = 4096;  // in bytes.
 const char kCollapseKey[] = "collapse_key";
 const char kGoogDotRestrictedPrefix[] = "goog.";
 const char kGoogleRestrictedPrefix[] = "google";
@@ -208,9 +208,9 @@ bool GcmSendFunction::ValidateMessageData(const gcm::MessageData& data) const {
     total_size += iter->first.size() + iter->second.size();
 
     if (!IsMessageKeyValid(iter->first) ||
-        kMaximumMessageSize < iter->first.size() ||
-        kMaximumMessageSize < iter->second.size() ||
-        kMaximumMessageSize < total_size)
+        kMaximumGcmMessageSize < iter->first.size() ||
+        kMaximumGcmMessageSize < iter->second.size() ||
+        kMaximumGcmMessageSize < total_size)
       return false;
   }
 

chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -94,7 +94,7 @@ const char kNameKey[] = "name";
 const char kMetadataKey[] = "metadata";
 const char kAttachedImagesBlobInfoKey[] = "attachedImagesBlobInfo";
 const char kBlobUUIDKey[] = "blobUUID";
-const char kTypeKey[] = "type";
+const char kMediaGalleriesApiTypeKey[] = "type";
 const char kSizeKey[] = "size";
 
 const char kInvalidGalleryId[] = "-1";
@@ -752,7 +752,7 @@ void MediaGalleriesGetMetadataFunction::ConstructNextBlob(
   std::unique_ptr<base::DictionaryValue> attached_image(
       new base::DictionaryValue);
   attached_image->SetString(kBlobUUIDKey, current_blob->GetUUID());
-  attached_image->SetString(kTypeKey, current_image->type);
+  attached_image->SetString(kMediaGalleriesApiTypeKey, current_image->type);
   attached_image->SetInteger(
       kSizeKey, base::checked_cast<int>(current_image->data.size()));
   attached_images_list->Append(std::move(attached_image));

chrome/browser/extensions/api/messaging/native_message_process_host.cc

@@ -29,7 +29,7 @@ namespace {
 // Maximum message size in bytes for messages received from Native Messaging
 // hosts. Message size is limited mainly to prevent Chrome from crashing when
 // native application misbehaves (e.g. starts writing garbage to the pipe).
-const size_t kMaximumMessageSize = 1024 * 1024;
+const size_t kMaximumNativeMessageSize = 1024 * 1024;
 
 // Message header contains 4-byte integer size of the message.
 const size_t kMessageHeaderSize = 4;
@@ -273,7 +273,7 @@ void NativeMessageProcessHost::ProcessIncomingData(
     size_t message_size =
         *reinterpret_cast<const uint32_t*>(incoming_data_.data());
 
-    if (message_size > kMaximumMessageSize) {
+    if (message_size > kMaximumNativeMessageSize) {
       LOG(ERROR) << "Native Messaging host tried sending a message that is "
                  << message_size << " bytes long.";
       Close(kHostInputOutputError);

chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

@@ -137,9 +137,9 @@ const char kWebstoreLogin[] = "extensions.webstore_login";
 
 // Error messages that can be returned by the API.
 const char kAlreadyInstalledError[] = "This item is already installed";
-const char kInvalidIconUrlError[] = "Invalid icon url";
-const char kInvalidIdError[] = "Invalid id";
-const char kInvalidManifestError[] = "Invalid manifest";
+const char kWebstoreInvalidIconUrlError[] = "Invalid icon url";
+const char kWebstoreInvalidIdError[] = "Invalid id";
+const char kWebstoreInvalidManifestError[] = "Invalid manifest";
 const char kNoPreviousBeginInstallWithManifestError[] =
     "* does not match a previous call to beginInstallWithManifest3";
 const char kUserCancelledError[] = "User cancelled install";
@@ -202,16 +202,16 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() {
 
   if (!crx_file::id_util::IdIsValid(details().id)) {
     return RespondNow(BuildResponse(api::webstore_private::RESULT_INVALID_ID,
-                                    kInvalidIdError));
+                                    kWebstoreInvalidIdError));
   }
 
   GURL icon_url;
   if (details().icon_url) {
     icon_url = source_url().Resolve(*details().icon_url);
     if (!icon_url.is_valid()) {
-      return RespondNow(BuildResponse(
-          api::webstore_private::RESULT_INVALID_ICON_URL,
-          kInvalidIconUrlError));
+      return RespondNow(
+          BuildResponse(api::webstore_private::RESULT_INVALID_ICON_URL,
+                        kWebstoreInvalidIconUrlError));
     }
   }
 
@@ -275,7 +275,7 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnWebstoreParseSuccess(
   if (!dummy_extension_.get()) {
     OnWebstoreParseFailure(details().id,
                            WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
-                           kInvalidManifestError);
+                           kWebstoreInvalidManifestError);
     return;
   }
 
@@ -437,7 +437,7 @@ WebstorePrivateCompleteInstallFunction::Run() {
   }
 
   if (!crx_file::id_util::IdIsValid(params->expected_id))
-    return RespondNow(Error(kInvalidIdError));
+    return RespondNow(Error(kWebstoreInvalidIdError));
 
   approval_ = g_pending_approvals.Get().PopApproval(
       chrome_details_.GetProfile(), params->expected_id);

chrome/browser/extensions/menu_manager.cc

@@ -54,12 +54,12 @@ const char kCheckedKey[] = "checked";
 const char kContextsKey[] = "contexts";
 const char kDocumentURLPatternsKey[] = "document_url_patterns";
 const char kEnabledKey[] = "enabled";
-const char kIncognitoKey[] = "incognito";
+const char kMenuManagerIncognitoKey[] = "incognito";
 const char kParentUIDKey[] = "parent_uid";
 const char kStringUIDKey[] = "string_uid";
 const char kTargetURLPatternsKey[] = "target_url_patterns";
 const char kTitleKey[] = "title";
-const char kTypeKey[] = "type";
+const char kMenuManagerTypeKey[] = "type";
 const char kVisibleKey[] = "visible";
 
 void SetIdKeyValue(base::DictionaryValue* properties,
@@ -205,8 +205,8 @@ std::unique_ptr<base::DictionaryValue> MenuItem::ToValue() const {
   // string IDs for items.
   DCHECK_EQ(0, id_.uid);
   value->SetString(kStringUIDKey, id_.string_uid);
-  value->SetBoolean(kIncognitoKey, id_.incognito);
-  value->SetInteger(kTypeKey, type_);
+  value->SetBoolean(kMenuManagerIncognitoKey, id_.incognito);
+  value->SetInteger(kMenuManagerTypeKey, type_);
   if (type_ != SEPARATOR)
     value->SetString(kTitleKey, title_);
   if (type_ == CHECKBOX || type_ == RADIO)
@@ -228,14 +228,14 @@ std::unique_ptr<MenuItem> MenuItem::Populate(const std::string& extension_id,
                                              const base::DictionaryValue& value,
                                              std::string* error) {
   bool incognito = false;
-  if (!value.GetBoolean(kIncognitoKey, &incognito))
+  if (!value.GetBoolean(kMenuManagerIncognitoKey, &incognito))
     return nullptr;
   Id id(incognito, MenuItem::ExtensionKey(extension_id));
   if (!value.GetString(kStringUIDKey, &id.string_uid))
     return nullptr;
   int type_int;
   Type type = NORMAL;
-  if (!value.GetInteger(kTypeKey, &type_int))
+  if (!value.GetInteger(kMenuManagerTypeKey, &type_int))
     return nullptr;
   type = static_cast<Type>(type_int);
   std::string title;