shill: cellular: move using declaration to where it's needed
The 'using testing::ReturnRef' declaration isn't needed in
mock_mobile_operator_info.h, and thus should be moved to those .cc files
that actually reference testing::ReturnRef.
BUG=None
TEST=Run unit tests.
Change-Id: I752691d6d4504255e251f97a6b0081cf5f50ea4c
Reviewed-on: https://chromium-review.googlesource.com/428206
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/cellular/cellular_capability_gsm_unittest.cc b/cellular/cellular_capability_gsm_unittest.cc
index c510698..ec007eb 100644
--- a/cellular/cellular_capability_gsm_unittest.cc
+++ b/cellular/cellular_capability_gsm_unittest.cc
@@ -48,9 +48,10 @@
using base::Unretained;
using std::string;
using std::vector;
-using testing::_;
using testing::Invoke;
using testing::Return;
+using testing::ReturnRef;
+using testing::_;
namespace shill {
diff --git a/cellular/cellular_capability_universal_cdma_unittest.cc b/cellular/cellular_capability_universal_cdma_unittest.cc
index c736a9a..748cbe0 100644
--- a/cellular/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular/cellular_capability_universal_cdma_unittest.cc
@@ -52,6 +52,7 @@
using testing::Mock;
using testing::NiceMock;
using testing::Return;
+using testing::ReturnRef;
using testing::_;
namespace shill {
diff --git a/cellular/mock_mobile_operator_info.cc b/cellular/mock_mobile_operator_info.cc
index f699b11..780babd 100644
--- a/cellular/mock_mobile_operator_info.cc
+++ b/cellular/mock_mobile_operator_info.cc
@@ -18,6 +18,8 @@
#include <gmock/gmock.h>
+using testing::ReturnRef;
+
namespace shill {
MockMobileOperatorInfo::MockMobileOperatorInfo(EventDispatcher* dispatcher,
diff --git a/cellular/mock_mobile_operator_info.h b/cellular/mock_mobile_operator_info.h
index 74057f0..d332dbb 100644
--- a/cellular/mock_mobile_operator_info.h
+++ b/cellular/mock_mobile_operator_info.h
@@ -24,8 +24,6 @@
#include "shill/cellular/mobile_operator_info.h"
-using testing::ReturnRef;
-
namespace shill {
class MockMobileOperatorInfo : public MobileOperatorInfo {
