Remove remoting::Clipboard::Stop().

remoting/host/clipboard_x11.cc

 // 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.
 
 #include "remoting/host/clipboard.h"
 
 #include <X11/Xlib.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "remoting/host/linux/x_server_clipboard.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 
 namespace remoting {
 
 // This code is expected to be called on the desktop thread only.
 class ClipboardX11 : public Clipboard,
                      public base::MessageLoopForIO::Watcher {
  public:
   ClipboardX11();
   ~ClipboardX11() override;
 
   // Clipboard interface.
   void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
   void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
-  void Stop() override;
 
   // MessageLoopForIO::Watcher interface.
   void OnFileCanReadWithoutBlocking(int fd) override;
   void OnFileCanWriteWithoutBlocking(int fd) override;
 
  private:
   void OnClipboardChanged(const std::string& mime_type,
                           const std::string& data);
   void PumpXEvents();
 
@@ skipping 10 matching lines @@
   base::MessageLoopForIO::FileDescriptorWatcher x_connection_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ClipboardX11);
 };
 
 ClipboardX11::ClipboardX11()
     : display_(nullptr) {
 }
 
 ClipboardX11::~ClipboardX11() {
-  Stop();
+  client_clipboard_.reset();

[Lambros, 2015/02/17 21:37:33]

Don't need?

[Sergey Ulanov, 2015/02/17 23:51:42]

Done.

+  x_connection_watcher_.StopWatchingFileDescriptor();
+
+  if (display_) {
+    XCloseDisplay(display_);
+    display_ = nullptr;

[Lambros, 2015/02/17 21:37:33]

Don't need?

[Sergey Ulanov, 2015/02/17 23:51:42]

Done.

+  }
 }
 
 void ClipboardX11::Start(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   // TODO(lambroslambrou): Share the X connection with InputInjector.
   display_ = XOpenDisplay(nullptr);
   if (!display_) {
     LOG(ERROR) << "Couldn't open X display";
     return;
   }
@@ skipping 10 matching lines @@
       &x_connection_watcher_,
       this);
   PumpXEvents();
 }
 
 void ClipboardX11::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   x_server_clipboard_.SetClipboard(event.mime_type(), event.data());
 }
 
-void ClipboardX11::Stop() {
-  client_clipboard_.reset();
-  x_connection_watcher_.StopWatchingFileDescriptor();
-
-  if (display_) {
-    XCloseDisplay(display_);
-    display_ = nullptr;
-  }
-}
-
 void ClipboardX11::OnFileCanReadWithoutBlocking(int fd) {
   PumpXEvents();
 }
 
 void ClipboardX11::OnFileCanWriteWithoutBlocking(int fd) {
 }
 
 void ClipboardX11::OnClipboardChanged(const std::string& mime_type,
                                       const std::string& data) {
   protocol::ClipboardEvent event;
@@ skipping 13 matching lines @@
     XNextEvent(display_, &event);
     x_server_clipboard_.ProcessXEvent(&event);
   }
 }
 
 scoped_ptr<Clipboard> Clipboard::Create() {
   return make_scoped_ptr(new ClipboardX11());
 }
 
 }  // namespace remoting