Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

athena/content/web_activity.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 "athena/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view.h"
 #include "athena/content/content_proxy.h"
@@ skipping 348 matching lines @@
 
     ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator());
     settings.SetTweenType(gfx::Tween::EASE_IN);
     ui::Layer* layer = progress_bar_.get();
     settings.AddObserver(new ui::ClosureAnimationObserver(
         base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release())));
     layer->SetOpacity(0.f);
   }
 
   content::JavaScriptDialogManager* GetJavaScriptDialogManager() override {
-    return GetJavaScriptDialogManagerInstance();
+    return app_modal_dialogs::JavaScriptDialogManager::GetInstance();
   }
 
   content::ColorChooser* OpenColorChooser(
       content::WebContents* web_contents,
       SkColor color,
       const std::vector<content::ColorSuggestion>& suggestions) override {
     return athena::OpenColorChooser(web_contents, color, suggestions);
   }
 
   // Called when a file selection is to be done.
@@ skipping 273 matching lines @@
   if (content_proxy_.get())
     content_proxy_.reset(nullptr);
 }
 
 void WebActivity::ShowContentProxy() {
   if (!content_proxy_.get())
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena