Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

3 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/userfeedback/proto/common.proto b/chrome/browser/userfeedback/proto/common.proto
index 97c60fb..291e6a1 100644
--- a/chrome/browser/userfeedback/proto/common.proto
+++ b/chrome/browser/userfeedback/proto/common.proto
@@ -16,7 +16,13 @@ message CommonData {
   // Description of the problem entered by user.
   optional string description = 2;
   optional string description_translated = 4;
-  optional string source_descripton_language = 5 [ default = "en" ];
+  optional string source_description_language = 5 [ default = "en" ];
+  optional string ui_language = 6 [ default = "en_US" ];
 
   optional string user_email = 3;
+  
+  // Unique identifier of feedback report. If set than only one report
+  // with the same identifier is stored in the system.
+  // If you are not sure how to use it leave it not set.
+  optional string unique_report_identifier = 7;
 };
diff --git a/chrome/browser/userfeedback/proto/extension.proto b/chrome/browser/userfeedback/proto/extension.proto
index d600f8a..71be3dc 100644
--- a/chrome/browser/userfeedback/proto/extension.proto
+++ b/chrome/browser/userfeedback/proto/extension.proto
@@ -8,6 +8,7 @@ syntax = "proto2";
 package userfeedback;
 
 import "common.proto";
+import "chrome.proto";
 import "dom.proto";
 import "math.proto";
 import "web.proto";
@@ -64,6 +65,8 @@ message ExternalExtensionSubmit {
   optional HtmlDocument html_document_structure = 5;
 
   optional ExtensionErrors extension_errors = 13;
+
+  optional ChromeData chrome_data = 14;
 };
 
 // Sent when user hits final submit button in internal extension.
diff --git a/chrome/browser/userfeedback/proto/web.proto b/chrome/browser/userfeedback/proto/web.proto
index fb9f6af..71b0b29 100644
--- a/chrome/browser/userfeedback/proto/web.proto
+++ b/chrome/browser/userfeedback/proto/web.proto
@@ -8,7 +8,6 @@ package userfeedback;
 // Data present in Web related feedbacks
 
 import "annotations.proto";
-import "config.proto";
 import "dom.proto";
 import "math.proto";