Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(326)

Side by Side Diff: chrome/browser/extensions/extension_browsertest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/extensions/extension_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 Delegate* delegate, 330 Delegate* delegate,
331 const Extension* extension, 331 const Extension* extension,
332 const ShowDialogCallback& show_dialog_callback) OVERRIDE { 332 const ShowDialogCallback& show_dialog_callback) OVERRIDE {
333 delegate->InstallUIProceed(); 333 delegate->InstallUIProceed();
334 } 334 }
335 }; 335 };
336 336
337 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore( 337 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore(
338 const base::FilePath& path, 338 const base::FilePath& path,
339 int expected_change) { 339 int expected_change) {
340 return InstallOrUpdateExtension("", path, INSTALL_UI_TYPE_NONE, 340 return InstallOrUpdateExtension(std::string(),
341 expected_change, Manifest::INTERNAL, 341 path,
342 browser(), true); 342 INSTALL_UI_TYPE_NONE,
343 expected_change,
344 Manifest::INTERNAL,
345 browser(),
346 true);
343 } 347 }
344 348
345 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( 349 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension(
346 const std::string& id, 350 const std::string& id,
347 const base::FilePath& path, 351 const base::FilePath& path,
348 InstallUIType ui_type, 352 InstallUIType ui_type,
349 int expected_change) { 353 int expected_change) {
350 return InstallOrUpdateExtension(id, path, ui_type, expected_change, 354 return InstallOrUpdateExtension(id, path, ui_type, expected_change,
351 Manifest::INTERNAL, browser(), false); 355 Manifest::INTERNAL, browser(), false);
352 } 356 }
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 case content::NOTIFICATION_LOAD_STOP: 735 case content::NOTIFICATION_LOAD_STOP:
732 VLOG(1) << "Got LOAD_STOP notification."; 736 VLOG(1) << "Got LOAD_STOP notification.";
733 MessageLoopForUI::current()->Quit(); 737 MessageLoopForUI::current()->Quit();
734 break; 738 break;
735 739
736 default: 740 default:
737 NOTREACHED(); 741 NOTREACHED();
738 break; 742 break;
739 } 743 }
740 } 744 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.h ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698