Skip to content

Commit f2303fd

Browse files
author
Mykola Tryshnivskyy
committed
Fixed warning in webdriver_session.cc
1 parent f623cd4 commit f2303fd

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/chrome/test/webdriver/webdriver_session.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ Error* Session::MoveAndClickElement(const FrameId& frame_id,
13931393
const ElementId& element) {
13941394

13951395
if (frame_id.view_id.IsApp()) {
1396-
Error* error = NULL;
1396+
Error* error;
13971397
Point location;
13981398

13991399
error = GetClickableLocation(element, &location);
@@ -1684,24 +1684,24 @@ Error* Session::WaitForAllViewsToStopLoading() {
16841684

16851685
Error* Session::InstallExtension(
16861686
const FilePath& path, std::string* extension_id) {
1687-
// Error* error = NULL;
1687+
Error* error = NULL;
16881688
// RunSessionTask(base::Bind(
16891689
// &Automation::InstallExtension,
16901690
// base::Unretained(automation_.get()),
16911691
// path,
16921692
// extension_id,
16931693
// &error));
1694-
// return error;
1694+
return error;
16951695
}
16961696

16971697
Error* Session::GetExtensionsInfo(base::ListValue* extensions_list) {
1698-
// Error* error = NULL;
1698+
Error* error = NULL;
16991699
// RunSessionTask(base::Bind(
17001700
// &Automation::GetExtensionsInfo,
17011701
// base::Unretained(automation_.get()),
17021702
// extensions_list,
17031703
// &error));
1704-
// return error;
1704+
return error;
17051705
}
17061706

17071707
Error* Session::IsPageActionVisible(
@@ -1713,27 +1713,27 @@ Error* Session::IsPageActionVisible(
17131713
// kUnknownError,
17141714
// "The current target does not support page actions. Switch to a tab.");
17151715
// }
1716-
// Error* error = NULL;
1716+
Error* error = NULL;
17171717
// RunSessionTask(base::Bind(
17181718
// &Automation::IsPageActionVisible,
17191719
// base::Unretained(automation_.get()),
17201720
// tab_id,
17211721
// extension_id,
17221722
// is_visible,
17231723
// &error));
1724-
// return error;
1724+
return error;
17251725
}
17261726

17271727
Error* Session::SetExtensionState(
17281728
const std::string& extension_id, bool enable) {
1729-
// Error* error = NULL;
1729+
Error* error = NULL;
17301730
// RunSessionTask(base::Bind(
17311731
// &Automation::SetExtensionState,
17321732
// base::Unretained(automation_.get()),
17331733
// extension_id,
17341734
// enable,
17351735
// &error));
1736-
// return error;
1736+
return error;
17371737
}
17381738

17391739
Error* Session::ClickExtensionButton(
@@ -1749,13 +1749,13 @@ Error* Session::ClickExtensionButton(
17491749
}
17501750

17511751
Error* Session::UninstallExtension(const std::string& extension_id) {
1752-
// Error* error = NULL;
1752+
Error* error = NULL;
17531753
// RunSessionTask(base::Bind(
17541754
// &Automation::UninstallExtension,
17551755
// base::Unretained(automation_.get()),
17561756
// extension_id,
17571757
// &error));
1758-
// return error;
1758+
return error;
17591759
}
17601760

17611761
Error* Session::SetPreference(
@@ -1782,7 +1782,7 @@ Error* Session::SetPreference(
17821782
// if (error)
17831783
// error->AddDetails("Failed to set local state pref '" + pref + "'");
17841784
// }
1785-
// return error;
1785+
return error;
17861786
}
17871787

17881788
base::ListValue* Session::GetLog() const {

0 commit comments

Comments
 (0)