[Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."""

chrome/browser/guestview/webview/webview_find_helper.cc

 // Copyright 2014 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/guest_view/web_view/web_view_find_helper.h"
+#include "chrome/browser/guestview/webview/webview_find_helper.h"
 
 #include <utility>
 
 #include "chrome/browser/extensions/api/webview/webview_api.h"
-#include "chrome/browser/guest_view/web_view/web_view_constants.h"
+#include "chrome/browser/guestview/webview/webview_constants.h"
 
 WebviewFindHelper::WebviewFindHelper(WebViewGuest* webview_guest)
     : webview_guest_(webview_guest),
       current_find_request_id_(0) {
 }
 
 WebviewFindHelper::~WebviewFindHelper() {
 }
 
 void WebviewFindHelper::CancelAllFindSessions() {
   current_find_session_ = linked_ptr<WebviewFindHelper::FindInfo>();
   while (!find_info_map_.empty()) {
     find_info_map_.begin()->second->SendResponse(true /* canceled */);
     find_info_map_.erase(find_info_map_.begin());
   }
   if (find_update_event_.get())
     DispatchFindUpdateEvent(true /* canceled */, true /* final_update */);
   find_update_event_.reset();
 }
 
 void WebviewFindHelper::DispatchFindUpdateEvent(bool canceled,
                                                 bool final_update) {
   DCHECK(find_update_event_.get());
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   find_update_event_->PrepareResults(args.get());
   args->SetBoolean(webview::kFindCanceled, canceled);
   args->SetBoolean(webview::kFindFinalUpdate, final_update);
   DCHECK(webview_guest_);
-  webview_guest_->DispatchEvent(
-      new GuestViewBase::Event(webview::kEventFindReply, args.Pass()));
+  webview_guest_->DispatchEvent(new GuestView::Event(webview::kEventFindReply,
+                                                     args.Pass()));
 }
 
 void WebviewFindHelper::EndFindSession(int session_request_id, bool canceled) {
   FindInfoMap::iterator session_iterator =
       find_info_map_.find(session_request_id);
   DCHECK(session_iterator != find_info_map_.end());
   FindInfo* find_info = session_iterator->second.get();
 
   // Call the callback function of the first request of the find session.
   find_info->SendResponse(canceled);
@@ skipping 219 matching lines @@
 void WebviewFindHelper::FindInfo::SendResponse(bool canceled) {
   // Prepare the find results to pass to the callback function.
   base::DictionaryValue results;
   find_results_.PrepareResults(&results);
   results.SetBoolean(webview::kFindCanceled, canceled);
 
   // Call the callback.
   find_function_->SetResult(results.DeepCopy());
   find_function_->SendResponse(true);
 }