Move extension_error_utils.* and url_pattern_set.* into

chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc

 // Copyright (c) 2012 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/extensions/api/offscreen_tabs/offscreen_tabs_api.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/json/json_writer.h"
+#include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
+#include "extensions/common/extension_error_utils.h"
 
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::NotificationDetails;
 using content::NotificationSource;
 using content::WebContents;
+using extensions::ErrorUtils;
 using WebKit::WebInputEvent;
 
 namespace keys = extensions::offscreen_tabs_constants;
 namespace tabs_keys = extensions::tabs_constants;
 namespace events = extensions::event_names;
 
 // TODO(avi): Kill this when TabContents goes away.
 class OffscreenTabContentsCreator {
  public:
   static TabContents* CreateTabContents(content::WebContents* contents) {
@@ skipping 292 matching lines @@
   if (parent_tab) {
     const OffscreenTabs& tabs = parent_tab->offscreen_tabs();
     for (OffscreenTabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i) {
       if ((*i)->GetID() == offscreen_tab_id) {
         *offscreen_tab = *i;
         return true;
       }
     }
   }
 
-  *error = ExtensionErrorUtils::FormatErrorMessage(
+  *error = ErrorUtils::FormatErrorMessage(
       keys::kOffscreenTabNotFoundError, base::IntToString(offscreen_tab_id));
   return false;
 }
 
 ParentTab* OffscreenTabMap::GetParentTab(WebContents* parent_contents,
                                          const std::string& extension_id) {
   CHECK(parent_contents);
 
   int parent_tab_id = ExtensionTabUtil::GetTabId(parent_contents);
   if (map_.find(parent_tab_id) == map_.end())
@@ skipping 93 matching lines @@
   DictionaryValue* create_props;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &create_props));
 
   std::string url_string;
   EXTENSION_FUNCTION_VALIDATE(create_props->GetString(
       tabs_keys::kUrlKey, &url_string));
 
   GURL url = ExtensionTabUtil::ResolvePossiblyRelativeURL(
       url_string, GetExtension());
   if (!url.is_valid()) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(
+    error_ = ErrorUtils::FormatErrorMessage(
         tabs_keys::kInvalidUrlError, url_string);
     return false;
   }
 
   if (ExtensionTabUtil::IsCrashURL(url)) {
     error_ = tabs_keys::kNoCrashBrowserError;
     return false;
   }
 
   gfx::Rect window_bounds;
@@ skipping 46 matching lines @@
 GetOffscreenTabFunction::GetOffscreenTabFunction() {}
 GetOffscreenTabFunction::~GetOffscreenTabFunction() {}
 
 bool GetOffscreenTabFunction::RunImpl() {
   int offscreen_tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &offscreen_tab_id));
 
   OffscreenTab* offscreen_tab = NULL;
   if (!GetMap()->GetOffscreenTab(
           offscreen_tab_id, this, &offscreen_tab, &error_)) {
-    error_ = ExtensionErrorUtils::FormatErrorMessage(
+    error_ = ErrorUtils::FormatErrorMessage(
         keys::kOffscreenTabNotFoundError, base::IntToString(offscreen_tab_id));
     return false;
   }
 
   SetResult(offscreen_tab->CreateValue());
   return true;
 }
 
 GetAllOffscreenTabFunction::GetAllOffscreenTabFunction() {}
 GetAllOffscreenTabFunction::~GetAllOffscreenTabFunction() {}
@@ skipping 286 matching lines @@
   // async case (when a "javascript": URL is sent to a tab).
   if (!is_async)
     SendResponse(true);
 
   return true;
 }
 
 void UpdateOffscreenTabFunction::PopulateResult() {
   // There's no result associated with this callback.
 }