Merge from Chromium at DEPS revision 614f7b807940

This commit was generated by merge_to_master.py.

Change-Id: I89d093f14f8025ce1e505ce2a2755212c5c4fd2a

5 files changed, 11 insertions, 14 deletions

diff --git a/components/feedback/feedback_data.cc b/components/feedback/feedback_data.cc
index 42e4b9f99f..3abe1cfc95 100644
--- a/components/feedback/feedback_data.cc
+++ b/components/feedback/feedback_data.cc
@@ -92,11 +92,8 @@ void FeedbackData::AttachAndCompressFileData(
   if (!attached_filedata.get() || attached_filedata->empty())
     return;
   ++pending_op_count_;
-#if defined(OS_WIN)
-  base::FilePath attached_file(base::UTF8ToWide(attached_filename_));
-#else
-  base::FilePath attached_file(attached_filename_);
-#endif
+  base::FilePath attached_file =
+                  base::FilePath::FromUTF8Unsafe(attached_filename_);
   BrowserThread::PostBlockingPoolTaskAndReply(
       FROM_HERE,
       base::Bind(&FeedbackCommon::CompressFile,
diff --git a/components/feedback/feedback_data.h b/components/feedback/feedback_data.h
index 3fdf75c0cb..54749abb9f 100644
--- a/components/feedback/feedback_data.h
+++ b/components/feedback/feedback_data.h
@@ -77,7 +77,7 @@ class FeedbackData : public FeedbackCommon {
   }
 
  private:
-  virtual ~FeedbackData();
+  ~FeedbackData() override;
 
   // Called once a compression operation is complete.
   void OnCompressComplete();
diff --git a/components/feedback/feedback_uploader_chrome.h b/components/feedback/feedback_uploader_chrome.h
index 6c4381d3c8..9a1d52c1ec 100644
--- a/components/feedback/feedback_uploader_chrome.h
+++ b/components/feedback/feedback_uploader_chrome.h
@@ -19,7 +19,7 @@ class FeedbackUploaderChrome : public FeedbackUploader,
  public:
   explicit FeedbackUploaderChrome(content::BrowserContext* context);
 
-  virtual void DispatchReport(const std::string& data) OVERRIDE;
+  void DispatchReport(const std::string& data) override;
 
  private:
   // Browser context this uploader was created for.
diff --git a/components/feedback/feedback_uploader_delegate.h b/components/feedback/feedback_uploader_delegate.h
index 2729f43906..93cbd6823d 100644
--- a/components/feedback/feedback_uploader_delegate.h
+++ b/components/feedback/feedback_uploader_delegate.h
@@ -22,11 +22,11 @@ class FeedbackUploaderDelegate : public net::URLFetcherDelegate {
   FeedbackUploaderDelegate(const std::string& post_body,
                            const base::Closure& success_callback,
                            const ReportDataCallback& error_callback);
-  virtual ~FeedbackUploaderDelegate();
+  ~FeedbackUploaderDelegate() override;
 
  private:
   // Overridden from net::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   std::string post_body_;
   base::Closure success_callback_;
diff --git a/components/feedback/feedback_uploader_factory.h b/components/feedback/feedback_uploader_factory.h
index fe9957df59..13e9ee3ff3 100644
--- a/components/feedback/feedback_uploader_factory.h
+++ b/components/feedback/feedback_uploader_factory.h
@@ -31,13 +31,13 @@ class FeedbackUploaderFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<FeedbackUploaderFactory>;
 
   FeedbackUploaderFactory();
-  virtual ~FeedbackUploaderFactory();
+  ~FeedbackUploaderFactory() override;
 
   // BrowserContextKeyedServiceFactory overrides:
-  virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
+  KeyedService* BuildServiceInstanceFor(
+      content::BrowserContext* context) const override;
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackUploaderFactory);
 };