Give the different KDataFile variables unique prefixes

In the jumbo build experiment (chromium unity builds) there is a
collision between the two different kDataFile strings. This patch
renames them kNetworkErrorDataFile and kTargetsDataFile which also
matches their intended values.

Bug: 746953
Change-Id: Ib9f47fa4d358303c7cdbb65b54b40080521a915d
Reviewed-on: https://chromium-review.googlesource.com/721299Reviewed-by: Bence Béky <bnc@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#509320}

content/browser/accessibility/accessibility_ui.cc

@@ -37,7 +37,7 @@
 #include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 
-static const char kDataFile[] = "targets-data.json";
+static const char kTargetsDataFile[] = "targets-data.json";
 
 static const char kProcessIdField[]  = "processId";
 static const char kRouteIdField[]  = "routeId";
@@ -118,7 +118,7 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
 bool HandleRequestCallback(BrowserContext* current_context,
                            const std::string& path,
                            const WebUIDataSource::GotDataCallback& callback) {
-  if (path != kDataFile)
+  if (path != kTargetsDataFile)
     return false;
   std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
 
@@ -204,7 +204,7 @@ AccessibilityUI::AccessibilityUI(WebUI* web_ui) : WebUIController(web_ui) {
       base::Bind(&HandleRequestCallback,
                  web_ui->GetWebContents()->GetBrowserContext()));
 
-  html_source->UseGzip({kDataFile});
+  html_source->UseGzip({kTargetsDataFile});
 
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();

content/browser/net/network_errors_listing_ui.cc

@@ -17,7 +17,7 @@
 #include "net/base/net_errors.h"
 #include "net/log/net_log_util.h"
 
-static const char kDataFile[] = "network-error-data.json";
+static const char kNetworkErrorDataFile[] = "network-error-data.json";
 static const char kErrorCodeField[]  = "errorCode";
 static const char kErrorCodesDataName[] = "errorCodes";
 static const char kErrorIdField[]  = "errorId";
@@ -60,7 +60,7 @@ std::unique_ptr<base::ListValue> GetNetworkErrorData() {
 bool HandleRequestCallback(BrowserContext* current_context,
                            const std::string& path,
                            const WebUIDataSource::GotDataCallback& callback) {
-  if (path != kDataFile)
+  if (path != kNetworkErrorDataFile)
     return false;
 
   base::DictionaryValue data;