Tied up BlimpNavigationController to NavigationFeature

blimp/client/core/contents/navigation_feature_unittest.cc

Index: blimp/client/core/contents/navigation_feature_unittest.cc
diff --git a/blimp/client/feature/navigation_feature_unittest.cc b/blimp/client/core/contents/navigation_feature_unittest.cc
similarity index 96%
rename from blimp/client/feature/navigation_feature_unittest.cc
rename to blimp/client/core/contents/navigation_feature_unittest.cc
index 8a5c0ba692a6496ef659852ae7ef437f3944248d..d7189d4adfd4431a1f81e9774d305fd67e2304a6 100644
--- a/blimp/client/feature/navigation_feature_unittest.cc
+++ b/blimp/client/core/contents/navigation_feature_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/feature/navigation_feature.h"
+#include "blimp/client/core/contents/navigation_feature.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "blimp/client/feature/mock_navigation_feature_delegate.h"
+#include "blimp/client/core/contents/mock_navigation_feature_delegate.h"
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/net/test_common.h"
@@ -16,7 +16,6 @@
 #include "net/base/test_completion_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 using testing::_;