Move search-related files from chrome/common to chrome/common/search

chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

 // 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 "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
@@ skipping 11 matching lines @@
 #include "chrome/browser/prerender/prerender_origin.h"
 #include "chrome/browser/prerender/prerender_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/instant_types.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/search/instant_types.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/geometry/size.h"
 
@@ skipping 494 matching lines @@
   std::tuple<base::string16, EmbeddedSearchRequestParams> params;
   ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
   EXPECT_EQ("foo", base::UTF16ToASCII(std::get<0>(params)));
   EXPECT_EQ("f", base::UTF16ToASCII(std::get<1>(params).original_query));
   EXPECT_EQ("utf-8", base::UTF16ToASCII(std::get<1>(params).input_encoding));
   EXPECT_EQ("", base::UTF16ToASCII(std::get<1>(params).rlz_parameter_value));
   EXPECT_EQ("chrome...0",
             base::UTF16ToASCII(std::get<1>(params).assisted_query_stats));
 }
 #endif