Fix feedback log collection.

chrome/browser/feedback/feedback_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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_UTIL_H_
 #define CHROME_BROWSER_FEEDBACK_FEEDBACK_UTIL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/feedback/feedback_data.h"
 #include "chrome/browser/feedback/proto/common.pb.h"
 #include "chrome/browser/feedback/proto/dom.pb.h"
 #include "chrome/browser/feedback/proto/extension.pb.h"
 #include "chrome/browser/feedback/proto/math.pb.h"
 #include "chrome/browser/ui/webui/screenshot_source.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "base/sys_info.h"
 #elif defined(OS_WIN)
 #include "base/win/windows_version.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/system/syslogs_provider.h"
 #endif
 
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 extern const char kSyncDataKey[];
 
 #if defined(OS_CHROMEOS)
 extern const char kHUDLogDataKey[];

[xiyuan, 2013/03/19 02:14:48]

Should we remove this?

[rkc, 2013/03/19 19:58:59]

This is used by the touch code in syslogs provider (which itself is not needed
anymore since we're pulling the touch logs from the touch log source correctly
now). Removed and killed the unused dependent code.

Done.

 #endif
 
 class FeedbackUtil {
  public:
 
 #if defined(OS_MACOSX)
   enum BugType {
     PAGE_WONT_LOAD = 0,
     PAGE_LOOKS_ODD,
     PHISHING_PAGE,
@@ skipping 16 matching lines @@
   //     is probably the right one to extend, but will require changing
   //     all the call sites or making it a wrapper around another util.
   static void SetOSVersion(std::string *os_version);
 
   // Send the feedback report after the specified delay
   static void DispatchFeedback(Profile* profile,
                                std::string* feedback_data,
                                int64 delay);
 
   // Generates bug report data.
-  static void SendReport(const FeedbackData& data);
+  static void SendReport(scoped_refptr<FeedbackData> data);
   // Redirects the user to Google's phishing reporting page.
   static void ReportPhishing(content::WebContents* current_tab,
                              const std::string& phishing_url);
   // Maintains a single vector of bytes to store the last screenshot taken.
   static std::vector<unsigned char>* GetScreenshotPng();
   static void ClearScreenshotPng();
   static void SetScreenshotSize(const gfx::Rect& rect);
   static gfx::Rect& GetScreenshotSize();
 
   class PostCleanup;
@@ skipping 10 matching lines @@
                            int64 previous_delay);
 
 #if defined(OS_CHROMEOS)
   static bool ValidFeedbackSize(const std::string& content);
 #endif
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FeedbackUtil);
 };
 
 #endif  // CHROME_BROWSER_FEEDBACK_FEEDBACK_UTIL_H_