Reverting 30062.

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2009 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/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 1126 matching lines @@
     Browser* browser = browser_tracker_->GetResource(handle);
     browser->FindInPage(false, false);
   }
 }
 
 void AutomationProvider::GetFindWindowVisibility(int handle, bool* visible) {
   *visible = false;
   Browser* browser = browser_tracker_->GetResource(handle);
   if (browser) {
     FindBarTesting* find_bar =
-        browser->GetFindBarController()->find_bar()->GetFindBarTesting();
+        browser->find_bar()->find_bar()->GetFindBarTesting();
     find_bar->GetFindBarWindowInfo(NULL, visible);
   }
 }
 
 void AutomationProvider::HandleFindWindowLocationRequest(int handle, int* x,
                                                          int* y) {
   gfx::Point position(0, 0);
   bool visible = false;
   if (browser_tracker_->ContainsHandle(handle)) {
      Browser* browser = browser_tracker_->GetResource(handle);
      FindBarTesting* find_bar =
-       browser->GetFindBarController()->find_bar()->GetFindBarTesting();
+       browser->find_bar()->find_bar()->GetFindBarTesting();
      find_bar->GetFindBarWindowInfo(&position, &visible);
   }
 
   *x = position.x();
   *y = position.y();
 }
 
 void AutomationProvider::HandleInspectElementRequest(
     int handle, int x, int y, IPC::Message* reply_message) {
   TabContents* tab_contents = GetTabContentsForHandle(handle, NULL);
@@ skipping 989 matching lines @@
                                       reply_message);
 
     profile_->GetExtensionsService()->LoadExtension(extension_dir);
     profile_->GetUserScriptMaster()->AddWatchedPath(extension_dir);
   } else {
     AutomationMsg_LoadExpandedExtension::WriteReplyParams(
         reply_message, AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
     Send(reply_message);
   }
 }