Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.

content/browser/mock_content_browser_client.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/scoped_temp_dir.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace content {
 
 // Base for unit tests that need to mock the ContentBrowserClient.
 class MockContentBrowserClient : public ContentBrowserClient {
  public:
   MockContentBrowserClient();
   virtual ~MockContentBrowserClient();
 
-  virtual BrowserMainParts* CreateBrowserMainParts(
-      const content::MainFunctionParams& parameters) OVERRIDE;
+  virtual void CreateBrowserMainParts(
+      const content::MainFunctionParams& parameters,
+      std::vector<BrowserMainParts*>* parts_list) OVERRIDE;
   virtual RenderWidgetHostView* CreateViewForWidget(
       RenderWidgetHost* widget) OVERRIDE;
   virtual TabContentsView* CreateTabContentsView(
       TabContents* tab_contents) OVERRIDE;
   virtual void RenderViewHostCreated(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderProcessHostCreated(
       RenderProcessHost* host) OVERRIDE;
   virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;
   virtual WebUIFactory* GetWebUIFactory() OVERRIDE;
@@ skipping 126 matching lines @@
  private:
   // Temporary directory for GetDefaultDownloadDirectory.
   ScopedTempDir download_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(MockContentBrowserClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_