Cleanup: Constify more ExtensionService methods, and IWYU.

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/default_web_intent_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
@@ skipping 52 matching lines @@
           "}\\n"
         "}\\n"
       "}\\n\","
       "\"family_safe\":true,"
       "\"icon_url\": \"%s\"}]}";
 
 const char kCWSFakeIconURLFormat[] = "http://example.com/%s/icon.png";
 
 class DummyURLFetcherFactory : public net::URLFetcherFactory {
  public:
-   DummyURLFetcherFactory() {}
-   virtual ~DummyURLFetcherFactory() {}
+  DummyURLFetcherFactory() {}
+  virtual ~DummyURLFetcherFactory() {}
 
-   virtual net::URLFetcher* CreateURLFetcher(
-       int id,
-       const GURL& url,
-       net::URLFetcher::RequestType request_type,
-       net::URLFetcherDelegate* d) OVERRIDE {
-     return new net::TestURLFetcher(id, url, d);
-   }
+  virtual net::URLFetcher* CreateURLFetcher(
+      int id,
+      const GURL& url,
+      net::URLFetcher::RequestType request_type,
+      net::URLFetcherDelegate* d) OVERRIDE {
+    return new net::TestURLFetcher(id, url, d);
+  }
 };
 
 }  // namespace
 
 class WebIntentPickerMock : public WebIntentPicker,
                             public WebIntentPickerModelObserver {
  public:
   WebIntentPickerMock()
       : num_installed_services_(0),
         num_icons_changed_(0),
@@ skipping 322 matching lines @@
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 
   OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL());
 }
 
-class WebIntentPickerControllerIncognitoBrowserTest :
-    public WebIntentPickerControllerBrowserTest {
+class WebIntentPickerControllerIncognitoBrowserTest
+    : public WebIntentPickerControllerBrowserTest {
  public:
   WebIntentPickerControllerIncognitoBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     incognito_browser_ = CreateIncognitoBrowser();
     WebIntentPickerControllerBrowserTest::SetUpOnMainThread();
   }
 
   virtual Browser* GetBrowser() OVERRIDE { return incognito_browser_; }
 
@@ skipping 188 matching lines @@
 
   EXPECT_EQ(2, picker_.num_installed_services_);
 
   // The tab is shown immediately without needing to call OnServiceChosen.
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 }