Revert of Make Hands-Off Zero-Touch Enrollment compatibile with tests

chrome/browser/chromeos/hats/hats_notification_controller_unittest.cc

 // Copyright 2016 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/chromeos/hats/hats_notification_controller.h"
 
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/network/network_state.h"
-#include "chromeos/network/portal_detector/mock_network_portal_detector.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/image_fetcher/core/image_fetcher.h"
 #include "components/image_fetcher/core/image_fetcher_delegate.h"
 #include "components/image_fetcher/core/request_metadata.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/message_center/fake_message_center_tray_delegate.h"
 #include "ui/message_center/message_center.h"
 
 using testing::_;
 using testing::AtLeast;
 using testing::Invoke;
 using testing::Return;
 using testing::SaveArg;
 using testing::StrictMock;
 
 using image_fetcher::ImageFetcher;
 using image_fetcher::ImageFetcherDelegate;
 
 namespace chromeos {
 
 namespace {
 
+class MockNetworkPortalDetector : public NetworkPortalDetector {
+ public:
+  MockNetworkPortalDetector() {}
+  ~MockNetworkPortalDetector() override {}
+
+  MOCK_METHOD1(AddObserver,
+               void(chromeos::NetworkPortalDetector::Observer* observer));
+  MOCK_METHOD1(RemoveObserver,
+               void(chromeos::NetworkPortalDetector::Observer* observer));
+  MOCK_METHOD1(AddAndFireObserver,
+               void(chromeos::NetworkPortalDetector::Observer* observer));
+  MOCK_METHOD1(GetCaptivePortalState,
+               chromeos::NetworkPortalDetector::CaptivePortalState(
+                   const std::string& service_path));
+  MOCK_METHOD0(IsEnabled, bool());
+  MOCK_METHOD1(Enable, void(bool start_detection));
+  MOCK_METHOD0(StartDetectionIfIdle, bool());
+  MOCK_METHOD1(SetStrategy,
+               void(chromeos::PortalDetectorStrategy::StrategyId id));
+  MOCK_METHOD0(OnLockScreenRequest, void());
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockNetworkPortalDetector);
+};
+
 class MockImageFetcher : public image_fetcher::ImageFetcher {
  public:
   MockImageFetcher() {}
   ~MockImageFetcher() override {}
 
   MOCK_METHOD3(StartOrQueueNetworkRequest,
                void(const std::string&,
                     const GURL&,
                     const ImageFetcher::ImageFetcherCallback&));
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
@@ skipping 216 matching lines @@
   ASSERT_TRUE(base::Time::FromInternalValue(new_timestamp) >
               base::Time::FromInternalValue(now_timestamp));
 
   // Destructor for HatsController removes self from observer list.
   EXPECT_CALL(mock_network_portal_detector_,
               RemoveObserver(hats_notification_controller.get()))
       .Times(1);
 }
 
 }  // namespace chromeos