| Index: chrome/browser/local_discovery/privet_notifications_unittest.cc | 
| diff --git a/chrome/browser/local_discovery/privet_notifications_unittest.cc b/chrome/browser/local_discovery/privet_notifications_unittest.cc | 
| deleted file mode 100644 | 
| index b4c437007380d9ab18fc6ac46927ae220e7ee611..0000000000000000000000000000000000000000 | 
| --- a/chrome/browser/local_discovery/privet_notifications_unittest.cc | 
| +++ /dev/null | 
| @@ -1,217 +0,0 @@ | 
| -// Copyright 2013 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 "base/thread_task_runner_handle.h" | 
| -#include "chrome/browser/local_discovery/privet_http_asynchronous_factory.h" | 
| -#include "chrome/browser/local_discovery/privet_http_impl.h" | 
| -#include "chrome/browser/local_discovery/privet_notifications.h" | 
| -#include "net/url_request/test_url_fetcher_factory.h" | 
| -#include "net/url_request/url_request_test_util.h" | 
| -#include "testing/gmock/include/gmock/gmock.h" | 
| -#include "testing/gtest/include/gtest/gtest.h" | 
| - | 
| -using testing::StrictMock; | 
| - | 
| -using ::testing::_; | 
| -using ::testing::SaveArg; | 
| - | 
| -namespace local_discovery { | 
| - | 
| -namespace { | 
| - | 
| -const char kExampleDeviceName[] = "test._privet._tcp.local"; | 
| -const char kExampleDeviceHumanName[] = "Test device"; | 
| -const char kExampleDeviceDescription[] = "Testing testing"; | 
| -const char kExampleDeviceID[] = "__test__id"; | 
| -const char kDeviceInfoURL[] = "http://1.2.3.4:8080/privet/info"; | 
| - | 
| -const char kInfoResponseUptime20[] = "{\"uptime\": 20}"; | 
| -const char kInfoResponseUptime3600[] = "{\"uptime\": 3600}"; | 
| -const char kInfoResponseNoUptime[] = "{}"; | 
| - | 
| -class MockPrivetNotificationsListenerDeleagate | 
| -    : public PrivetNotificationsListener::Delegate { | 
| - public: | 
| -  MOCK_METHOD2(PrivetNotify, void(int devices_active, bool added)); | 
| -  MOCK_METHOD0(PrivetRemoveNotification, void()); | 
| -}; | 
| - | 
| -class MockPrivetHttpFactory : public PrivetHTTPAsynchronousFactory { | 
| - public: | 
| -  class MockResolution : public PrivetHTTPResolution { | 
| -   public: | 
| -    MockResolution(const std::string& name, | 
| -                   net::URLRequestContextGetter* request_context) | 
| -        : name_(name), request_context_(request_context) {} | 
| - | 
| -    ~MockResolution() override {} | 
| - | 
| -    void Start(const net::HostPortPair& address, | 
| -               const ResultCallback& callback) override { | 
| -      callback.Run(scoped_ptr<PrivetHTTPClient>(new PrivetHTTPClientImpl( | 
| -          name_, net::HostPortPair("1.2.3.4", 8080), request_context_.get()))); | 
| -    } | 
| - | 
| -    void Start(const ResultCallback& callback) override { | 
| -      Start(net::HostPortPair(), callback); | 
| -    } | 
| - | 
| -    const std::string& GetName() override { return name_; } | 
| - | 
| -   private: | 
| -    std::string name_; | 
| -    scoped_refptr<net::URLRequestContextGetter> request_context_; | 
| -  }; | 
| - | 
| -  explicit MockPrivetHttpFactory(net::URLRequestContextGetter* request_context) | 
| -      : request_context_(request_context) { | 
| -  } | 
| - | 
| -  scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( | 
| -      const std::string& name) override { | 
| -    return scoped_ptr<PrivetHTTPResolution>( | 
| -        new MockResolution(name, request_context_.get())); | 
| -  } | 
| - | 
| - private: | 
| -    scoped_refptr<net::URLRequestContextGetter> request_context_; | 
| -}; | 
| - | 
| -class PrivetNotificationsListenerTest : public ::testing::Test { | 
| - public: | 
| -  PrivetNotificationsListenerTest() | 
| -      : request_context_(new net::TestURLRequestContextGetter( | 
| -            base::ThreadTaskRunnerHandle::Get())) { | 
| -    notification_listener_.reset(new PrivetNotificationsListener( | 
| -        scoped_ptr<PrivetHTTPAsynchronousFactory>( | 
| -            new MockPrivetHttpFactory(request_context_.get())), | 
| -        &mock_delegate_)); | 
| - | 
| -    description_.name = kExampleDeviceHumanName; | 
| -    description_.description = kExampleDeviceDescription; | 
| -  } | 
| - | 
| -  virtual ~PrivetNotificationsListenerTest() { | 
| -  } | 
| - | 
| -  bool SuccessfulResponseToInfo(const std::string& response) { | 
| -    net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0); | 
| -    EXPECT_TRUE(fetcher); | 
| -    EXPECT_EQ(GURL(kDeviceInfoURL), fetcher->GetOriginalURL()); | 
| - | 
| -    if (!fetcher || GURL(kDeviceInfoURL) != fetcher->GetOriginalURL()) | 
| -      return false; | 
| - | 
| -    fetcher->SetResponseString(response); | 
| -    fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, | 
| -                                              net::OK)); | 
| -    fetcher->set_response_code(200); | 
| -    fetcher->delegate()->OnURLFetchComplete(fetcher); | 
| -    return true; | 
| -  } | 
| - | 
| - protected: | 
| -  StrictMock<MockPrivetNotificationsListenerDeleagate> mock_delegate_; | 
| -  scoped_ptr<PrivetNotificationsListener> notification_listener_; | 
| -  base::MessageLoop message_loop_; | 
| -  scoped_refptr<net::TestURLRequestContextGetter> request_context_; | 
| -  net::TestURLFetcherFactory fetcher_factory_; | 
| -  DeviceDescription description_; | 
| -}; | 
| - | 
| -TEST_F(PrivetNotificationsListenerTest, DisappearReappearTest) { | 
| - | 
| -  EXPECT_CALL(mock_delegate_, PrivetNotify( | 
| -      1, | 
| -      true)); | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  SuccessfulResponseToInfo(kInfoResponseUptime20); | 
| - | 
| -  EXPECT_CALL(mock_delegate_, PrivetRemoveNotification()); | 
| - | 
| -  notification_listener_->DeviceRemoved( | 
| -      kExampleDeviceName); | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  description_.id = kExampleDeviceID; | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| -} | 
| - | 
| -TEST_F(PrivetNotificationsListenerTest, RegisterTest) { | 
| -  EXPECT_CALL(mock_delegate_, PrivetNotify( | 
| -      1, | 
| -      true)); | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  SuccessfulResponseToInfo(kInfoResponseUptime20); | 
| - | 
| -  EXPECT_CALL(mock_delegate_, PrivetRemoveNotification()); | 
| - | 
| -  description_.id = kExampleDeviceID; | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| -} | 
| - | 
| -TEST_F(PrivetNotificationsListenerTest, HighUptimeTest) { | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  SuccessfulResponseToInfo(kInfoResponseUptime3600); | 
| - | 
| -  description_.id = kExampleDeviceID; | 
| - | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| -} | 
| - | 
| -TEST_F(PrivetNotificationsListenerTest, HTTPErrorTest) { | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0); | 
| - | 
| -  fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS, | 
| -                                            net::OK)); | 
| -  fetcher->set_response_code(200); | 
| -  fetcher->delegate()->OnURLFetchComplete(fetcher); | 
| -} | 
| - | 
| -TEST_F(PrivetNotificationsListenerTest, DictionaryErrorTest) { | 
| -  notification_listener_->DeviceChanged( | 
| -      true, | 
| -      kExampleDeviceName, | 
| -      description_); | 
| - | 
| -  SuccessfulResponseToInfo(kInfoResponseNoUptime); | 
| -} | 
| - | 
| -}  // namespace | 
| - | 
| -}  // namespace local_discovery | 
|  |