scoped_ptr.PassAs is removed

atom/browser/atom_browser_context.cc

@@ -68,8 +68,7 @@ net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory(
               base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
 
   // Set up interceptors in the reverse order.
-  scoped_ptr<net::URLRequestJobFactory> top_job_factory =
-      job_factory.PassAs<net::URLRequestJobFactory>();
+  scoped_ptr<net::URLRequestJobFactory> top_job_factory = job_factory.Pass();
   content::URLRequestInterceptorScopedVector::reverse_iterator it;
   for (it = interceptors->rbegin(); it != interceptors->rend(); ++it)
     top_job_factory.reset(new net::URLRequestInterceptingJobFactory(

chromium_src/chrome/browser/extensions/global_shortcut_listener_mac.h

@@ -41,12 +41,12 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
   bool OnMediaOrVolumeKeyEvent(int key_code);
 
   // GlobalShortcutListener implementation.
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
+  virtual void StartListening() override;
+  virtual void StopListening() override;
   virtual bool RegisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
   virtual void UnregisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
 
   // Mac-specific functions for registering hot keys with modifiers.
   bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id);

chromium_src/chrome/browser/extensions/global_shortcut_listener_win.h

@@ -26,15 +26,15 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener,
   virtual void OnWndProc(HWND hwnd,
                          UINT message,
                          WPARAM wparam,
-                         LPARAM lparam) OVERRIDE;
+                         LPARAM lparam) override;
 
   // GlobalShortcutListener implementation.
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
+  virtual void StartListening() override;
+  virtual void StopListening() override;
   virtual bool RegisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
   virtual void UnregisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
 
   // Whether this object is listening for global shortcuts.
   bool is_listening_;

chromium_src/chrome/browser/extensions/global_shortcut_listener_x11.h

@@ -23,17 +23,17 @@ class GlobalShortcutListenerX11 : public GlobalShortcutListener,
   virtual ~GlobalShortcutListenerX11();
 
   // ui::PlatformEventDispatcher implementation.
-  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
-  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) OVERRIDE;
+  virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
+  virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
 
  private:
   // GlobalShortcutListener implementation.
-  virtual void StartListening() OVERRIDE;
-  virtual void StopListening() OVERRIDE;
+  virtual void StartListening() override;
+  virtual void StopListening() override;
   virtual bool RegisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
   virtual void UnregisterAcceleratorImpl(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
 
   // Invoked when a global shortcut is pressed.
   void OnXKeyPressEvent(::XEvent* x_event);

chromium_src/chrome/browser/printing/print_job.h

@@ -51,14 +51,14 @@ class PrintJob : public PrintJobWorkerOwner,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // PrintJobWorkerOwner implementation.
   virtual void GetSettingsDone(const PrintSettings& new_settings,
-                               PrintingContext::Result result) OVERRIDE;
-  virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE;
-  virtual const PrintSettings& settings() const OVERRIDE;
-  virtual int cookie() const OVERRIDE;
+                               PrintingContext::Result result) override;
+  virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
+  virtual const PrintSettings& settings() const override;
+  virtual int cookie() const override;
 
   // Starts the actual printing. Signals the worker that it should begin to
   // spool as soon as data is available.

chromium_src/chrome/browser/printing/print_job_manager.h

@@ -66,7 +66,7 @@ class PrintJobManager : public content::NotificationObserver {
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Returns queries queue. Never returns NULL. Must be called on Browser UI
   // Thread. Reference could be stored and used from any thread.

chromium_src/chrome/browser/printing/print_job_worker.cc

@@ -40,8 +40,8 @@ class PrintingContextDelegate : public PrintingContext::Delegate {
   PrintingContextDelegate(int render_process_id, int render_view_id);
   virtual ~PrintingContextDelegate();
 
-  virtual gfx::NativeView GetParentView() OVERRIDE;
-  virtual std::string GetAppLocale() OVERRIDE;
+  virtual gfx::NativeView GetParentView() override;
+  virtual std::string GetAppLocale() override;
 
  private:
   int render_process_id_;

chromium_src/chrome/browser/printing/print_view_manager_base.cc

@@ -144,7 +144,7 @@ void PrintViewManagerBase::OnDidPrintPage(
 #if !defined(OS_WIN)
   // Update the rendered document. It will send notifications to the listener.
   document->SetPage(params.page_number,
-                    metafile.PassAs<MetafilePlayer>(),
+                    metafile.Pass(),
                     params.page_size,
                     params.content_area);
 

chromium_src/chrome/browser/printing/print_view_manager_base.h

@@ -43,7 +43,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
 #endif  // !DISABLE_BASIC_PRINTING
 
   // PrintedPagesSource implementation.
-  virtual base::string16 RenderSourceName() OVERRIDE;
+  virtual base::string16 RenderSourceName() override;
 
  protected:
   explicit PrintViewManagerBase(content::WebContents* web_contents);
@@ -52,10 +52,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
   bool PrintNowInternal(IPC::Message* message);
 
   // Terminates or cancels the print job if one was pending.
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+  virtual void RenderProcessGone(base::TerminationStatus status) override;
 
   // content::WebContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC Message handlers.
   virtual void OnPrintingFailed(int cookie);
@@ -64,10 +64,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Cancels the print job.
-  virtual void NavigationStopped() OVERRIDE;
+  virtual void NavigationStopped() override;
 
   // IPC Message handlers.
   void OnDidGetPrintedPagesCount(int cookie, int number_pages);

chromium_src/chrome/browser/printing/print_view_manager_basic.h

@@ -32,10 +32,10 @@ class PrintViewManagerBasic
 
   // content::WebContentsObserver implementation.
   // Terminates or cancels the print job if one was pending.
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+  virtual void RenderProcessGone(base::TerminationStatus status) override;
 
   // content::WebContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 #endif
 
  private:
@@ -43,7 +43,7 @@ class PrintViewManagerBasic
   friend class content::WebContentsUserData<PrintViewManagerBasic>;
 
 #if defined(OS_ANDROID)
-  virtual void OnPrintingFailed(int cookie) OVERRIDE;
+  virtual void OnPrintingFailed(int cookie) override;
 
   // The file descriptor into which the PDF of the page will be written.
   base::FileDescriptor file_descriptor_;

chromium_src/chrome/browser/printing/printer_query.h

@@ -33,10 +33,10 @@ class PrinterQuery : public PrintJobWorkerOwner {
 
   // PrintJobWorkerOwner implementation.
   virtual void GetSettingsDone(const PrintSettings& new_settings,
-                               PrintingContext::Result result) OVERRIDE;
-  virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) OVERRIDE;
-  virtual const PrintSettings& settings() const OVERRIDE;
-  virtual int cookie() const OVERRIDE;
+                               PrintingContext::Result result) override;
+  virtual PrintJobWorker* DetachWorker(PrintJobWorkerOwner* new_owner) override;
+  virtual const PrintSettings& settings() const override;
+  virtual int cookie() const override;
 
   // Initializes the printing context. It is fine to call this function multiple
   // times to reinitialize the settings. |web_contents_observer| can be queried

chromium_src/chrome/browser/speech/tts_controller_impl.h

@@ -29,26 +29,26 @@ class TtsControllerImpl : public TtsController {
   static TtsControllerImpl* GetInstance();
 
   // TtsController methods
-  virtual bool IsSpeaking() OVERRIDE;
-  virtual void SpeakOrEnqueue(Utterance* utterance) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual void Pause() OVERRIDE;
-  virtual void Resume() OVERRIDE;
+  virtual bool IsSpeaking() override;
+  virtual void SpeakOrEnqueue(Utterance* utterance) override;
+  virtual void Stop() override;
+  virtual void Pause() override;
+  virtual void Resume() override;
   virtual void OnTtsEvent(int utterance_id,
                   TtsEventType event_type,
                   int char_index,
-                  const std::string& error_message) OVERRIDE;
+                  const std::string& error_message) override;
   virtual void GetVoices(content::BrowserContext* browser_context,
-                         std::vector<VoiceData>* out_voices) OVERRIDE;
-  virtual void VoicesChanged() OVERRIDE;
+                         std::vector<VoiceData>* out_voices) override;
+  virtual void VoicesChanged() override;
   virtual void AddVoicesChangedDelegate(
-      VoicesChangedDelegate* delegate) OVERRIDE;
+      VoicesChangedDelegate* delegate) override;
   virtual void RemoveVoicesChangedDelegate(
-      VoicesChangedDelegate* delegate) OVERRIDE;
-  virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) OVERRIDE;
-  virtual TtsEngineDelegate* GetTtsEngineDelegate() OVERRIDE;
-  virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) OVERRIDE;
-  virtual int QueueSize() OVERRIDE;
+      VoicesChangedDelegate* delegate) override;
+  virtual void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override;
+  virtual TtsEngineDelegate* GetTtsEngineDelegate() override;
+  virtual void SetPlatformImpl(TtsPlatformImpl* platform_impl) override;
+  virtual int QueueSize() override;
 
  protected:
   TtsControllerImpl();

chromium_src/chrome/browser/speech/tts_linux.cc

@@ -32,18 +32,18 @@ struct SPDChromeVoice {
 
 class TtsPlatformImplLinux : public TtsPlatformImpl {
  public:
-  virtual bool PlatformImplAvailable() OVERRIDE;
+  virtual bool PlatformImplAvailable() override;
   virtual bool Speak(
       int utterance_id,
       const std::string& utterance,
       const std::string& lang,
       const VoiceData& voice,
-      const UtteranceContinuousParameters& params) OVERRIDE;
-  virtual bool StopSpeaking() OVERRIDE;
-  virtual void Pause() OVERRIDE;
-  virtual void Resume() OVERRIDE;
-  virtual bool IsSpeaking() OVERRIDE;
-  virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
+      const UtteranceContinuousParameters& params) override;
+  virtual bool StopSpeaking() override;
+  virtual void Pause() override;
+  virtual void Resume() override;
+  virtual bool IsSpeaking() override;
+  virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
 
   void OnSpeechEvent(SPDNotificationType type);
 

chromium_src/chrome/browser/speech/tts_mac.mm

@@ -49,7 +49,7 @@ class TtsPlatformImplMac;
 
 class TtsPlatformImplMac : public TtsPlatformImpl {
  public:
-  virtual bool PlatformImplAvailable() OVERRIDE {
+  virtual bool PlatformImplAvailable() override {
     return true;
   }
 
@@ -58,17 +58,17 @@ class TtsPlatformImplMac : public TtsPlatformImpl {
       const std::string& utterance,
       const std::string& lang,
       const VoiceData& voice,
-      const UtteranceContinuousParameters& params) OVERRIDE;
+      const UtteranceContinuousParameters& params) override;
 
-  virtual bool StopSpeaking() OVERRIDE;
+  virtual bool StopSpeaking() override;
 
-  virtual void Pause() OVERRIDE;
+  virtual void Pause() override;
 
-  virtual void Resume() OVERRIDE;
+  virtual void Resume() override;
 
-  virtual bool IsSpeaking() OVERRIDE;
+  virtual bool IsSpeaking() override;
 
-  virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
+  virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
 
   // Called by ChromeTtsDelegate when we get a callback from the
   // native speech engine.

chromium_src/chrome/browser/speech/tts_win.cc

@@ -34,7 +34,7 @@ class TtsPlatformImplWin : public TtsPlatformImpl {
 
   virtual bool IsSpeaking();
 
-  virtual void GetVoices(std::vector<VoiceData>* out_voices) OVERRIDE;
+  virtual void GetVoices(std::vector<VoiceData>* out_voices) override;
 
   // Get the single instance of this class.
   static TtsPlatformImplWin* GetInstance();

chromium_src/chrome/browser/ui/cocoa/color_chooser_mac.mm

@@ -45,8 +45,8 @@ class ColorChooserMac : public content::ColorChooser {
   void DidChooseColorInColorPanel(SkColor color);
   void DidCloseColorPabel();
 
-  virtual void End() OVERRIDE;
-  virtual void SetSelectedColor(SkColor color) OVERRIDE;
+  virtual void End() override;
+  virtual void SetSelectedColor(SkColor color) override;
 
  private:
   static ColorChooserMac* current_color_chooser_;

chromium_src/chrome/browser/ui/views/color_chooser_aura.h

@@ -31,12 +31,12 @@ class ColorChooserAura : public content::ColorChooser,
   ColorChooserAura(content::WebContents* web_contents, SkColor initial_color);
 
   // content::ColorChooser overrides:
-  virtual void End() OVERRIDE;
-  virtual void SetSelectedColor(SkColor color) OVERRIDE;
+  virtual void End() override;
+  virtual void SetSelectedColor(SkColor color) override;
 
   // views::ColorChooserListener overrides:
-  virtual void OnColorChosen(SkColor color) OVERRIDE;
-  virtual void OnColorChooserDialogClosed() OVERRIDE;
+  virtual void OnColorChosen(SkColor color) override;
+  virtual void OnColorChooserDialogClosed() override;
 
   void DidEndColorChooser();
 

chromium_src/chrome/browser/ui/views/color_chooser_dialog.h

@@ -26,8 +26,8 @@ class ColorChooserDialog
   virtual ~ColorChooserDialog();
 
   // BaseShellDialog:
-  virtual bool IsRunning(gfx::NativeWindow owning_window) const OVERRIDE;
-  virtual void ListenerDestroyed() OVERRIDE;
+  virtual bool IsRunning(gfx::NativeWindow owning_window) const override;
+  virtual void ListenerDestroyed() override;
 
  private:
   struct ExecuteOpenParams {

chromium_src/chrome/browser/ui/views/color_chooser_win.cc

@@ -24,8 +24,8 @@ class ColorChooserWin : public content::ColorChooser,
   ~ColorChooserWin();
 
   // content::ColorChooser overrides:
-  virtual void End() OVERRIDE;
-  virtual void SetSelectedColor(SkColor color) OVERRIDE {}
+  virtual void End() override;
+  virtual void SetSelectedColor(SkColor color) override {}
 
   // views::ColorChooserListener overrides:
   virtual void OnColorChosen(SkColor color);

chromium_src/chrome/renderer/printing/print_web_view_helper.h

@@ -79,9 +79,9 @@ class PrintWebViewHelper
   };
 
   // RenderViewObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void PrintPage(blink::WebLocalFrame* frame,
-                         bool user_initiated) OVERRIDE;
+                         bool user_initiated) override;
 
   // Message handlers ---------------------------------------------------------
 #if !defined(DISABLE_BASIC_PRINTING)

chromium_src/chrome/renderer/tts_dispatcher.h

@@ -37,15 +37,15 @@ class TtsDispatcher
   virtual ~TtsDispatcher();
 
   // RenderProcessObserver override.
-  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnControlMessageReceived(const IPC::Message& message) override;
 
   // blink::WebSpeechSynthesizer implementation.
-  virtual void updateVoiceList() OVERRIDE;
+  virtual void updateVoiceList() override;
   virtual void speak(const blink::WebSpeechSynthesisUtterance& utterance)
-      OVERRIDE;
-  virtual void pause() OVERRIDE;
-  virtual void resume() OVERRIDE;
-  virtual void cancel() OVERRIDE;
+      override;
+  virtual void pause() override;
+  virtual void resume() override;
+  virtual void cancel() override;
 
   blink::WebSpeechSynthesisUtterance FindUtterance(int utterance_id);