Make ContentBrowserClient not be owned by ContentClient, so that the latter d...

chrome/test/browser_with_test_window_test.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #define CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #pragma once
 
 #include "base/message_loop.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/test_browser_window.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class Browser;
 class GURL;
 class NavigationController;
 class TestBrowserWindow;
@@ skipping 68 matching lines @@
   void NavigateAndCommitActiveTab(const GURL& url);
 
  private:
 
   // We need to create a MessageLoop, otherwise a bunch of things fails.
   MessageLoopForUI ui_loop_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
+  chrome::ChromeContentBrowserClient browser_client_;
   scoped_ptr<TestBrowserWindow> window_;
   scoped_ptr<Browser> browser_;
 
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
 #endif  // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_