Remove ExtensionToolbarModel from ExtensionService.

chrome/browser/extensions/error_console/error_console_browsertest.cc

 // Copyright 2013 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/error_console/error_console.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/browser/extension_error.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_urls.h"
@@ skipping 212 matching lines @@
     *extension =
         LoadExtensionWithFlags(test_data_dir_.AppendASCII(path), flags);
     ASSERT_TRUE(*extension);
 
     switch (action) {
       case ACTION_NAVIGATE: {
         ui_test_utils::NavigateToURL(browser(), GetTestURL());
         break;
       }
       case ACTION_BROWSER_ACTION: {
-        ExtensionService* service =
-            extensions::ExtensionSystem::Get(profile())->extension_service();
-        service->toolbar_model()->ExecuteBrowserAction(
+        ExtensionToolbarModel::Get(profile())->ExecuteBrowserAction(
             *extension, browser(), NULL, true);
         break;
       }
       case ACTION_NONE:
         break;
       default:
         NOTREACHED();
     }
 
     observer.WaitForErrors();
@@ skipping 258 matching lines @@
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
   ASSERT_EQ(1u, stack_trace.size());
   CheckStackFrame(stack_trace[0],
                   script_url,
                   kAnonymousFunction,
                   5u, 1u);
 }
 
 }  // namespace extensions