summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
diff options
context:
space:
mode:
authorbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 00:37:54 +0000
committerbenwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 00:37:54 +0000
commit350c6dd57e9009ac1d2ecfbc797391914530e2cf (patch)
treeb4358cb8ec44c99d7c1189c345b2c7036357a1ea /chrome/browser/extensions/extension_toolbar_model_browsertest.cc
parentbfa5626b84d5beed9d775b807b5f28163dd1fff3 (diff)
downloadchromium_src-350c6dd57e9009ac1d2ecfbc797391914530e2cf.zip
chromium_src-350c6dd57e9009ac1d2ecfbc797391914530e2cf.tar.gz
chromium_src-350c6dd57e9009ac1d2ecfbc797391914530e2cf.tar.bz2
Remove ExtensionToolbarModel from ExtensionService.
This is a chrome concept and will prevent us moving ExtensionService to the extensions layer. It also has no real reason to be there. BUG=162530 Review URL: https://codereview.chromium.org/48853005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_toolbar_model_browsertest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index 4b3d734..6936213 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -3,8 +3,6 @@
// found in the LICENSE file.
#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/browser/ui/browser.h"
@@ -28,9 +26,7 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest,
}
virtual void SetUpOnMainThread() OVERRIDE {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
- model_ = service->toolbar_model();
+ model_ = ExtensionToolbarModel::Get(browser()->profile());
model_->AddObserver(this);
}