Tied up BlimpNavigationController to NavigationFeature

blimp/client/core/contents/navigation_feature_unittest.cc

 // Copyright 2015 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 "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"
 #include "net/base/net_errors.h"
 #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::_;
 
 namespace blimp {
 namespace client {
 
 void SendMockNavigationStateChangedMessage(BlimpMessageProcessor* processor,
                                            int tab_id,
                                            const GURL* url,
@@ skipping 117 matching lines @@
 
 TEST_F(NavigationFeatureTest, TestNavigateReloadMessage) {
   EXPECT_CALL(*out_processor_,
               MockableProcessMessage(EqualsNavigateReload(1), _))
       .Times(1);
   feature_.Reload(1);
 }
 
 }  // namespace client
 }  // namespace blimp