| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h" | 10 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 ExtensionApiTest::SetUp(); | 66 ExtensionApiTest::SetUp(); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void InitializeSync() { | 69 void InitializeSync() { |
| 70 ASSERT_TRUE(sync_setup_helper_->InitializeSync(profile())); | 70 ASSERT_TRUE(sync_setup_helper_->InitializeSync(profile())); |
| 71 } | 71 } |
| 72 | 72 |
| 73 // InProcessBrowserTest override. Destroys the sync client and sync | 73 // InProcessBrowserTest override. Destroys the sync client and sync |
| 74 // profile created by the test. We must clean up ProfileSyncServiceHarness | 74 // profile created by the test. We must clean up ProfileSyncServiceHarness |
| 75 // now before the profile is cleaned up. | 75 // now before the profile is cleaned up. |
| 76 virtual void CleanUpOnMainThread() OVERRIDE { | 76 virtual void TearDownOnMainThread() OVERRIDE { |
| 77 sync_setup_helper_.reset(); | 77 sync_setup_helper_.reset(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 const SyncSetupHelper* sync_setup_helper() const { | 80 const SyncSetupHelper* sync_setup_helper() const { |
| 81 return sync_setup_helper_.get(); | 81 return sync_setup_helper_.get(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 protected: | 84 protected: |
| 85 // Override InProcessBrowserTest. Change behavior of the default host | 85 // Override InProcessBrowserTest. Change behavior of the default host |
| 86 // resolver to avoid DNS lookup errors, so we can make network calls. | 86 // resolver to avoid DNS lookup errors, so we can make network calls. |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 "startTestWithCredentials('%s', '%s', '%s');", | 160 "startTestWithCredentials('%s', '%s', '%s');", |
| 161 client_id.c_str(), client_secret.c_str(), refresh_token.c_str())); | 161 client_id.c_str(), client_secret.c_str(), refresh_token.c_str())); |
| 162 | 162 |
| 163 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()-> | 163 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()-> |
| 164 ExecuteJavaScript(script_string); | 164 ExecuteJavaScript(script_string); |
| 165 | 165 |
| 166 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 166 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 167 } | 167 } |
| 168 | 168 |
| 169 } // namespace extensions | 169 } // namespace extensions |
| OLD | NEW |