[Device Discovery] Move files from browser/extensions/api/dial to browser/media/router/discovery/di…

chrome/browser/media/router/discovery/dial/dial_registry.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 "chrome/browser/extensions/api/dial/dial_registry.h"
+#include "chrome/browser/media/router/discovery/dial/dial_registry.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/api/dial/dial_api.h"
-#include "chrome/browser/extensions/api/dial/dial_device_data.h"
-#include "chrome/browser/extensions/api/dial/dial_service.h"
+#include "chrome/browser/media/router/discovery/dial/dial_device_data.h"
+#include "chrome/browser/media/router/discovery/dial/dial_service.h"
 #include "chrome/common/extensions/api/dial.h"

[imcheng, 2017/03/20 23:48:10]

Can this be removed?

[zhaobin, 2017/03/21 21:20:50]

Done.

 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/browser_thread.h"
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 using net::NetworkChangeNotifier;
 
-namespace extensions {
-namespace api {
-namespace dial {
+namespace media_router {
 
 DialRegistry::DialRegistry(base::TimeDelta refresh_interval,
                            base::TimeDelta expiration,
                            const size_t max_devices)
     : num_listeners_(0),
       registry_generation_(0),
       last_event_registry_generation_(0),
       label_count_(0),
       refresh_interval_delta_(refresh_interval),
       expiration_delta_(expiration),
@@ skipping 109 matching lines @@
 }
 
 void DialRegistry::StartPeriodicDiscovery() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!ReadyToDiscover() || dial_)
     return;
 
   dial_ = CreateDialService();
   dial_->AddObserver(this);
   DoDiscovery();
-  repeating_timer_.Start(FROM_HERE,
-                         refresh_interval_delta_,
-                         this,
+  repeating_timer_.Start(FROM_HERE, refresh_interval_delta_, this,
                          &DialRegistry::DoDiscovery);
 }
 
 void DialRegistry::DoDiscovery() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(dial_);
   VLOG(2) << "About to discover!";
   dial_->Discover();
 }
 
@@ skipping 34 matching lines @@
   Time now = Now();
 
   // Check against our default expiration timeout.
   Time default_expiration_time = device.response_time() + expiration_delta_;
   if (now > default_expiration_time)
     return true;
 
   // Check against the device's cache-control header, if set.
   if (device.has_max_age()) {
     Time max_age_expiration_time =
-      device.response_time() + TimeDelta::FromSeconds(device.max_age());
+        device.response_time() + TimeDelta::FromSeconds(device.max_age());
     if (now > max_age_expiration_time)
       return true;
   }
   return false;
 }
 
 void DialRegistry::Clear() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   device_by_id_map_.clear();
   device_by_label_map_.clear();
   registry_generation_++;
 }
 
 void DialRegistry::MaybeSendEvent() {
   // Send an event if the device list has changed since the last event.
   bool needs_event = last_event_registry_generation_ < registry_generation_;
-  VLOG(2) << "lerg = " << last_event_registry_generation_ << ", rg = "
-          << registry_generation_ << ", needs_event = " << needs_event;
+  VLOG(2) << "lerg = " << last_event_registry_generation_
+          << ", rg = " << registry_generation_
+          << ", needs_event = " << needs_event;
   if (needs_event)
     SendEvent();
 }
 
 void DialRegistry::SendEvent() {
   DeviceList device_list;
   for (DeviceByLabelMap::const_iterator it = device_by_label_map_.begin();
        it != device_by_label_map_.end(); ++it) {
     device_list.push_back(*(it->second));
   }
@@ skipping 119 matching lines @@
 void DialRegistry::OnDialDeviceEvent(const DeviceList& devices) {
   for (auto& observer : observers_)
     observer.OnDialDeviceEvent(devices);
 }
 
 void DialRegistry::OnDialError(DialErrorCode type) {
   for (auto& observer : observers_)
     observer.OnDialError(type);
 }
 
-}  // namespace dial
-}  // namespace api
-}  // namespace extensions
+}  // namespace media_router