Migrate upgrade notifications to observer

chrome/browser/service_process/service_process_control.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_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
 #define CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/id_map.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/upgrade_observer.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
 namespace base {
 class CommandLine;
 }
 
 namespace cloud_print {
 struct CloudPrintProxyInfo;
@@ skipping 10 matching lines @@
 //
 // It is used to start and terminate the service process. It is also used
 // to send and receive IPC messages from the service process.
 //
 // THREADING
 //
 // This class is accessed on the UI thread through some UI actions. It then
 // talks to the IPC channel on the IO thread.
 class ServiceProcessControl : public IPC::Sender,
                               public IPC::Listener,
-                              public content::NotificationObserver {
+                              public UpgradeObserver {
  public:
   enum ServiceProcessEvent {
     SERVICE_EVENT_INITIALIZE,
     SERVICE_EVENT_ENABLED_ON_LAUNCH,
     SERVICE_EVENT_ENABLE,
     SERVICE_EVENT_DISABLE,
     SERVICE_EVENT_DISABLE_BY_POLICY,
     SERVICE_EVENT_LAUNCH,
     SERVICE_EVENT_LAUNCHED,
     SERVICE_EVENT_LAUNCH_FAILED,
@@ skipping 41 matching lines @@
   virtual void Disconnect();
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   // IPC::Sender implementation
   bool Send(IPC::Message* message) override;
 
-  // content::NotificationObserver implementation.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // UpgradeObserver implementation.
+  void OnUpgradeRecommended() override;
 
   // Send a shutdown message to the service process. IPC channel will be
   // destroyed after calling this method.
   // Return true if the message was sent.
   // Virtual for testing.
   virtual bool Shutdown();
 
   // Send request for cloud print proxy info (enabled state, email, proxy id).
   // The callback gets the information when received.
   // Returns true if request was sent. Callback will be called only in case of
@@ skipping 103 matching lines @@
   PrintersCallback printers_callback_;
 
   // Callback that gets invoked when a status message is received from
   // the cloud print proxy.
   CloudPrintProxyInfoCallback cloud_print_info_callback_;
 
   // Callback that gets invoked when a message with histograms is received from
   // the service process.
   base::Closure histograms_callback_;
 
-  content::NotificationRegistrar registrar_;
-
   // Callback that gets invoked if service didn't reply in time.
   base::CancelableClosure histograms_timeout_callback_;
 
+  // Whether to start listening to upgrade detector.
+  bool enable_upgrade_observer_;
+
   base::WeakPtrFactory<ServiceProcessControl> weak_factory_;
 };

[sky, 2017/06/08 18:09:52]

DISALLOW... (while you are here).

[weidongg, 2017/06/08 18:58:07]

https://engdoc.corp.google.com/eng/doc/devguide/cpp/styleguide.shtml?cl=head#...
says DISALLOW_COPY_AND_ASSIGN is no longer permitted in new code. Should I add
this here?

[sky, 2017/06/08 21:28:00]

See chromium-dev discussions. I don't see this code deleting copy and assign
though.

[weidongg, 2017/06/08 22:18:25]

Added. Thanks.

 
 #endif  // CHROME_BROWSER_SERVICE_PROCESS_SERVICE_PROCESS_CONTROL_H_