Move c/c/e/extension_set to top-level extensions/

chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.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 <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_set.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
+#include "extensions/common/extension_set.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace {
 const char kTestExtensionId[] = "mfaehphpebmlbfdiegjnpidmibldjbjk";
 const char kPasswordFileForTest[] = "password-file-for-test";
 const char kOverrideUserDataDir[] = "override-user-data-dir";
 }  // namespace
 
 namespace extensions {
 
@@ skipping 131 matching lines @@
       "startTestWithCredentials('%s', '%s', '%s');",
       client_id.c_str(), client_secret.c_str(), refresh_token.c_str()));
 
   browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost()->
       ExecuteJavascriptInWebFrame(string16(), script_string);
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 }  // namespace extensions