Move content_browser_client.h to public, and while at it, move

chrome/browser/chrome_browser_main_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class BrowserMainTest : public testing::Test {
  public:
   BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {}
  protected:
   virtual void SetUp() {
     sandbox_init_wrapper_.reset(new SandboxInitWrapper());
   }
@@ skipping 52 matching lines @@
   }
   ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
   EXPECT_DEATH(cbw->WarmConnectionFieldTrial(),
                      "Not a valid socket reuse policy group");
 #else
   EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(),
                      "Not a valid socket reuse policy group");
 #endif
 }