Move feedback files into src/components

components/feedback/feedback_data.h

Index: components/feedback/feedback_data.h
diff --git a/chrome/browser/feedback/feedback_data.h b/components/feedback/feedback_data.h
similarity index 87%
rename from chrome/browser/feedback/feedback_data.h
rename to components/feedback/feedback_data.h
index bc566f5f9cd352a97007b84e8a06bfbbc8538952..bd8a9138c96781f954e01370589b6b8db41c30d6 100644
--- a/chrome/browser/feedback/feedback_data.h
+++ b/components/feedback/feedback_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
-#define CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
+#ifndef COMPONENTS_FEEDBACK_FEEDBACK_DATA_H_
+#define COMPONENTS_FEEDBACK_FEEDBACK_DATA_H_
 
 #include <map>
 #include <string>
@@ -17,7 +17,9 @@ namespace base {
 class FilePath;
 class RefCountedString;
 }
-class Profile;
+namespace content {
+class BrowserContext;
+}
 
 class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {

[jochen (gone - plz use gerrit), 2014/04/23 08:21:24]

please put everything within the component into its own namespace

[achaulk, 2014/04/23 14:51:32]

Done.

  public:
@@ -62,7 +64,7 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   void SendReport();
 
   // Getters
-  Profile* profile() const { return profile_; }
+  content::BrowserContext* context() const { return context_; }
   const std::string& category_tag() const { return category_tag_; }
   const std::string& page_url() const { return page_url_; }
   const std::string& description() const { return description_; }
@@ -79,9 +81,11 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   std::string* compressed_histograms() const {
     return compressed_histograms_.get();
   }
+  std::string user_agent() const { return user_agent_; }
+  std::string locale() const { return locale_; }
 
   // Setters
-  void set_profile(Profile* profile) { profile_ = profile; }
+  void set_context(content::BrowserContext* context) { context_ = context; }
   void set_category_tag(const std::string& category_tag) {
     category_tag_ = category_tag;
   }
@@ -103,6 +107,10 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
     screenshot_uuid_ = uuid;
   }
   void set_trace_id(int trace_id) { trace_id_ = trace_id; }
+  void set_user_agent(const std::string& user_agent) {
+    user_agent_ = user_agent;
+  }
+  void set_locale(const std::string& locale) { locale_ = locale; }
 
  private:
   friend class base::RefCountedThreadSafe<FeedbackData>;
@@ -112,7 +120,7 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   void OnGetTraceData(int trace_id,
                       scoped_refptr<base::RefCountedString> trace_data);
 
-  Profile* profile_;
+  content::BrowserContext* context_;
 
   std::string category_tag_;
   std::string page_url_;
@@ -121,6 +129,8 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   scoped_ptr<std::string> image_;
   std::string attached_filename_;
   scoped_ptr<std::string> attached_filedata_;
+  std::string user_agent_;
+  std::string locale_;
 
   std::string attached_file_uuid_;
   std::string screenshot_uuid_;
@@ -143,4 +153,4 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
   DISALLOW_COPY_AND_ASSIGN(FeedbackData);
 };
 
-#endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_DATA_H_
+#endif  // COMPONENTS_FEEDBACK_FEEDBACK_DATA_H_