Revert "Checkin for CL: http://codereview.chromium.org/3061044/show"

Broke compile.

TBR=rkc

Review URL: http://codereview.chromium.org/3199006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56717 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 65 deletions

diff --git a/chrome/browser/userfeedback/proto/chrome.proto b/chrome/browser/userfeedback/proto/chrome.proto
deleted file mode 100644
index 11b8eff..0000000
--- a/chrome/browser/userfeedback/proto/chrome.proto
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
-// Author: marcinm@google.com (Marcin Mikosik)
-
-syntax = "proto2";
-
-package userfeedback;
-
-// Chrome Browser and Chrome OS specific data.
-message ChromeData {
-  // Encapsulates the priorities of Buganizer issues.
-  enum ChromePlatform {
-    CHROME_OS = 1;
-    CHROME_BROWSER = 2;
-  }
-
-  // What platform has a report been sent from.
-  optional ChromePlatform chrome_platform = 1 [default = CHROME_OS];
-
-  optional ChromeOsData chrome_os_data = 2;
-
-  optional ChromeBrowserData chrome_browser_data = 3;
-}
-
-message ChromeOsData {
-  enum ChromeOsCategory {
-    CONNECTIVITY = 1;
-    SYNC = 2;
-    CRASH = 3;
-    PAGE_FORMATTING_OR_LAYOUT = 4;
-    EXTENSIONS_OR_APPS = 5;
-    STANDBY_OR_RESUME = 6;
-    PHISHING_PAGE = 7;
-    OTHER = 8;
-  }
-
-  optional ChromeOsCategory category = 1 [default = OTHER];
-}
-
-message ChromeBrowserData{
-
-  enum ChromeBrowserCategory {
-    PAGE_FORMATTING_OR_LAYOUT = 1;
-    PAGES_NOT_LOADING = 2;
-    PLUGINS = 3;
-    TABS_OR_WINDOWS = 4;
-    SYNCED_PREFERENCES = 5;
-    CRASH = 6;
-    EXTENSIONS_OR_APPS = 7;
-    PHISHING_PAGE = 8;
-    OTHER = 9;
-  }
-
-  optional ChromeBrowserCategory category = 1 [default = OTHER];
-}
-
diff --git a/chrome/browser/userfeedback/proto/common.proto b/chrome/browser/userfeedback/proto/common.proto
index 291e6a1..97c60fb 100644
--- a/chrome/browser/userfeedback/proto/common.proto
+++ b/chrome/browser/userfeedback/proto/common.proto
@@ -16,13 +16,7 @@ message CommonData {
   // Description of the problem entered by user.
   optional string description = 2;
   optional string description_translated = 4;
-  optional string source_description_language = 5 [ default = "en" ];
-  optional string ui_language = 6 [ default = "en_US" ];
+  optional string source_descripton_language = 5 [ default = "en" ];
 
   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 71be3dc..d600f8a 100644
--- a/chrome/browser/userfeedback/proto/extension.proto
+++ b/chrome/browser/userfeedback/proto/extension.proto
@@ -8,7 +8,6 @@ syntax = "proto2";
 package userfeedback;
 
 import "common.proto";
-import "chrome.proto";
 import "dom.proto";
 import "math.proto";
 import "web.proto";
@@ -65,8 +64,6 @@ 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 71b0b29..fb9f6af 100644
--- a/chrome/browser/userfeedback/proto/web.proto
+++ b/chrome/browser/userfeedback/proto/web.proto
@@ -8,6 +8,7 @@ package userfeedback;
 // Data present in Web related feedbacks
 
 import "annotations.proto";
+import "config.proto";
 import "dom.proto";
 import "math.proto";